From b723c3e199a930fa496cb8489e7f10fe06675076 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 6 Oct 2011 18:06:08 +0200 Subject: [PATCH] remove unused blame text view --- .../scm/api/rest/PlainBlameProvider.java | 172 ------------------ .../scm/api/rest/UriExtensionsConfig.java | 4 - 2 files changed, 176 deletions(-) delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/PlainBlameProvider.java diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/PlainBlameProvider.java b/scm-webapp/src/main/java/sonia/scm/api/rest/PlainBlameProvider.java deleted file mode 100644 index 7d25f3c001..0000000000 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/PlainBlameProvider.java +++ /dev/null @@ -1,172 +0,0 @@ -/** - * Copyright (c) 2010, Sebastian Sdorra - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of SCM-Manager; nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * http://bitbucket.org/sdorra/scm-manager - * - */ - - - -package sonia.scm.api.rest; - -//~--- non-JDK imports -------------------------------------------------------- - -import sonia.scm.repository.BlameLine; -import sonia.scm.repository.BlameResult; -import sonia.scm.util.Util; - -//~--- JDK imports ------------------------------------------------------------ - -import com.sun.jersey.core.provider.AbstractMessageReaderWriterProvider; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintWriter; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; - -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; - -/** - * - * @author Sebastian Sdorra - */ -@Provider -public class PlainBlameProvider - extends AbstractMessageReaderWriterProvider -{ - - /** - * Method description - * - * - * @param type - * @param genericType - * @param annotations - * @param mediaType - * @param httpHeaders - * @param entityStream - * - * @return - * - * @throws IOException - * @throws WebApplicationException - */ - @Override - public BlameResult readFrom(Class type, - Type genericType, Annotation[] annotations, - MediaType mediaType, - MultivaluedMap httpHeaders, - InputStream entityStream) - throws IOException, WebApplicationException - { - throw new IOException("method is not implemented"); - } - - /** - * Method description - * - * - * @param bpr - * @param type - * @param genericType - * @param annotations - * @param mediaType - * @param httpHeaders - * @param entityStream - * - * @throws IOException - * @throws WebApplicationException - */ - @Override - public void writeTo(BlameResult bpr, Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, - OutputStream entityStream) - throws IOException, WebApplicationException - { - PrintWriter writer = new PrintWriter(entityStream); - - for (BlameLine line : bpr.getBlameLines()) - { - String revision = line.getRevision(); - - if (Util.isNotEmpty(revision)) - { - writer.append(revision).append(" "); - } - - writer.println(line.getCode()); - } - - writer.flush(); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @param type - * @param genericType - * @param annotations - * @param mediaType - * - * @return - */ - @Override - public boolean isReadable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) - { - return false; - } - - /** - * Method description - * - * - * @param type - * @param genericType - * @param annotations - * @param mediaType - * - * @return - */ - @Override - public boolean isWriteable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) - { - return (type == BlameResult.class) - && mediaType.equals(MediaType.TEXT_PLAIN_TYPE); - } -} diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java b/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java index de5b748243..637866ad61 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java @@ -52,9 +52,6 @@ public class UriExtensionsConfig extends PackagesResourceConfig /** Field description */ public static final String EXTENSION_JSON = "json"; - /** Field description */ - public static final String EXTENSION_TXT = "txt"; - /** Field description */ public static final String EXTENSION_XML = "xml"; @@ -107,7 +104,6 @@ public class UriExtensionsConfig extends PackagesResourceConfig mediaTypeMap = new HashMap(); mediaTypeMap.put(EXTENSION_JSON, MediaType.APPLICATION_JSON_TYPE); mediaTypeMap.put(EXTENSION_XML, MediaType.APPLICATION_XML_TYPE); - mediaTypeMap.put(EXTENSION_TXT, MediaType.TEXT_PLAIN_TYPE); } return mediaTypeMap;