From b84e9582067a709b7890412bd64a1be2fec6963f Mon Sep 17 00:00:00 2001 From: Haruaki Tamada Date: Thu, 26 Aug 2010 17:06:19 +0900 Subject: [PATCH] =?utf8?q?=E3=82=AA=E3=83=BC=E3=83=90=E3=83=BC=E3=83=A9?= =?utf8?q?=E3=82=A4=E3=83=89=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=83=A1?= =?utf8?q?=E3=82=BD=E3=83=83=E3=83=89=E5=85=A8=E3=81=A6=E3=81=AB=20@Overri?= =?utf8?q?de=20=E3=82=A2=E3=83=8E=E3=83=86=E3=83=BC=E3=82=B7=E3=83=A7?= =?utf8?q?=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../java/jp/sourceforge/stigmata/Birthmark.java | 1 + .../jp/sourceforge/stigmata/BirthmarkElement.java | 3 +++ .../java/jp/sourceforge/stigmata/BirthmarkSet.java | 1 + .../stigmata/BirthmarkSpiComparator.java | 3 +++ .../sourceforge/stigmata/BirthmarkStoreTarget.java | 2 ++ .../jp/sourceforge/stigmata/ComparisonPair.java | 1 + .../stigmata/ComparisonPairFilterSet.java | 2 ++ .../sourceforge/stigmata/ComparisonResultSet.java | 1 + .../sourceforge/stigmata/ExtractionResultSet.java | 1 + .../stigmata/birthmarks/AbstractBirthmark.java | 6 ++++++ .../birthmarks/AbstractBirthmarkExtractor.java | 8 ++++++++ .../birthmarks/AbstractBirthmarkPreprocessor.java | 1 + .../birthmarks/AbstractBirthmarkService.java | 18 +++++++++++++++++ .../stigmata/birthmarks/BirthmarkService.java | 7 +++++++ .../stigmata/birthmarks/FrequencyBirthmark.java | 2 ++ .../birthmarks/FrequencyBirthmarkElement.java | 2 ++ .../stigmata/birthmarks/NullBirthmarkElement.java | 3 +++ .../comparators/AbstractBirthmarkComparator.java | 3 +++ .../AbstractBirthmarkComparatorService.java | 5 +++++ .../CosineSimilarityBirthmarkComparator.java | 2 +- ...CosineSimilarityBirthmarkComparatorService.java | 3 +++ .../comparators/DPMatchingBirthmarkComparator.java | 2 ++ .../DPMatchingBirthmarkComparatorService.java | 3 +++ .../EditDistanceBirthmarkComparator.java | 1 + .../EditDistanceBirthmarkComparatorService.java | 3 +++ ...ndedEditDistanceBirthmarkComparatorService.java | 3 +++ .../comparators/LogicalAndBirthmarkComparator.java | 2 ++ .../LogicalAndBirthmarkComparatorService.java | 3 +++ .../comparators/PlainBirthmarkComparator.java | 2 ++ .../PlainBirthmarkComparatorService.java | 3 +++ ...alueOfFieldVariableBirthmarkExtractVisitor.java | 8 ++++++++ ...tantValueOfFieldVariableBirthmarkExtractor.java | 1 + ...nstantValueOfFieldVariableBirthmarkService.java | 6 ++++++ .../cvfv/TypeAndValueBirthmarkElement.java | 4 ++++ .../AbstractBirthmarkExtractorService.java | 5 +++++ .../extractors/BirthmarkExtractorFactory.java | 2 +- ...ueOfFieldVariableBirthmarkExtractorService.java | 3 +++ ...equencyMethodCallBirthmarkExtractorService.java | 3 +++ ...quencyUsedClassesBirthmarkExtractorService.java | 3 +++ ...eritanceStructureBirthmarkExtractorService.java | 3 +++ .../KGramBasedBirthmarkExtractorService.java | 3 +++ ...uentialMethodCallBirthmarkExtractorService.java | 3 +++ .../UsedClassesBirthmarkExtractorService.java | 3 +++ .../fmc/FrequencyMethodCallBirthmarkExtractor.java | 1 + .../fmc/FrequencyMethodCallBirthmarkService.java | 6 ++++++ .../fuc/FrequencyUsedClassesBirthmarkService.java | 6 ++++++ ...nheritanceStructureBirthmarkExtractVisitor.java | 1 + .../is/InheritanceStructureBirthmarkExtractor.java | 1 + .../is/InheritanceStructureBirthmarkService.java | 6 ++++++ .../stigmata/birthmarks/kgram/KGram.java | 6 ++++-- .../kgram/KGramBasedBirthmarkElement.java | 4 +++- .../kgram/KGramBasedBirthmarkExtractVisitor.java | 1 + .../kgram/KGramBasedBirthmarkExtractor.java | 1 + .../kgram/KGramBasedBirthmarkService.java | 6 ++++++ .../birthmarks/smc/MethodCallBirthmarkElement.java | 3 +++ ...equentialMethodCallBirthmarkExtractVisitor.java | 2 ++ .../smc/SequentialMethodCallBirthmarkService.java | 6 ++++++ .../uc/UsedClassesBirthmarkExtractVisitor.java | 10 ++++++++++ .../uc/UsedClassesBirthmarkExtractor.java | 1 + .../birthmarks/uc/UsedClassesBirthmarkService.java | 6 ++++++ .../stigmata/command/AbstractStigmataCommand.java | 5 +++++ .../stigmata/command/CompareCommand.java | 3 +++ .../stigmata/command/ExportConfigCommand.java | 1 + .../stigmata/command/ExtractCommand.java | 3 +++ .../sourceforge/stigmata/command/GuiCommand.java | 2 ++ .../sourceforge/stigmata/command/HelpCommand.java | 1 + .../stigmata/command/InstallCommand.java | 2 ++ .../stigmata/command/LicenseCommand.java | 1 + .../stigmata/command/ListBirthmarksCommand.java | 1 + .../stigmata/command/UninstallCommand.java | 2 ++ .../stigmata/command/VersionCommand.java | 1 + .../stigmata/event/BirthmarkEngineAdapter.java | 4 ++++ .../filter/AbstractComparisonPairFilter.java | 4 ++++ .../AbstractComparisonPairFilterService.java | 3 +++ .../BirthmarkElementCountComparisonPairFilter.java | 3 +++ ...arkElementCountComparisonPairFilterService.java | 3 +++ .../filter/FilteredComparisonResultSet.java | 11 +++++++++++ .../filter/SimilarityComparisonPairFilter.java | 3 +++ .../SimilarityComparisonPairFilterService.java | 3 +++ .../filter/TargetNameComparisonPairFilter.java | 3 +++ .../TargetNameComparisonPairFilterService.java | 3 +++ .../TotalElementCountComparisonPairFilter.java | 3 +++ ...talElementCountComparisonPairFilterService.java | 3 +++ .../stigmata/hook/AbstractStigmataHookService.java | 8 ++++++++ .../stigmata/hook/MultipleStigmataHook.java | 2 ++ .../printer/AbstractBirthmarkServicePrinter.java | 4 ++++ .../printer/AbstractComparisonPairPrinter.java | 4 ++++ .../AbstractComparisonResultSetPrinter.java | 4 ++++ .../AbstractExtractionResultSetPrinter.java | 2 ++ .../printer/csv/BirthmarkServiceCsvPrinter.java | 1 + .../printer/csv/CsvResultPrinterService.java | 6 ++++++ .../printer/csv/ExtractionResultSetCsvPrinter.java | 1 + .../printer/xml/BirthmarkServiceXmlPrinter.java | 1 + .../printer/xml/ExtractionResultSetXmlPrinter.java | 3 +++ .../printer/xml/XmlResultPrinterService.java | 6 ++++++ .../resolvers/DefaultStigmataHomeResolver.java | 2 ++ .../resolvers/PropertyStigmataHomeResolver.java | 2 ++ .../result/AbstractComparisonResultSet.java | 8 ++++++++ .../result/AbstractExtractionResultSet.java | 23 ++++++++++++++++++++++ .../result/CertainPairComparisonResultSet.java | 7 +++++++ .../result/MemoryExtractedBirthmarkService.java | 4 ++++ .../stigmata/result/MemoryExtractionResultSet.java | 8 ++++++++ .../result/RDBExtractedBirthmarkService.java | 4 ++++ .../stigmata/result/RDBExtractionResultSet.java | 3 +++ .../result/RoundRobinComparisonResultSet.java | 12 +++++++++++ .../stigmata/result/SingleExtractionResultSet.java | 12 +++++++++++ .../result/XmlFileExtractedBirthmarkService.java | 4 ++++ .../result/XmlFileExtractionResultSet.java | 4 ++++ .../result/history/ExtractedBirthmarkHistory.java | 1 + .../history/MemoryExtractedBirthmarkHistory.java | 6 ++++++ .../history/RDBExtractedBirthmarkHistory.java | 6 ++++++ .../history/XmlFileExtractedBirthmarkHistory.java | 6 ++++++ .../stigmata/spi/AbstractServiceProvider.java | 3 +++ .../stigmata/spi/BirthmarkComparatorSpi.java | 2 ++ .../stigmata/spi/BirthmarkExtractorSpi.java | 2 ++ .../jp/sourceforge/stigmata/spi/BirthmarkSpi.java | 2 ++ .../stigmata/ui/swing/BirthmarkDefinitionPane.java | 9 +++++++++ .../ui/swing/BirthmarkExtractionResultPane.java | 2 ++ .../stigmata/ui/swing/BirthmarkSelectablePane.java | 2 ++ .../ui/swing/BirthmarkSelectionCheckSetPane.java | 3 +++ .../ui/swing/BirthmarkSelectionListPane.java | 4 ++++ .../ui/swing/BirthmarkServiceListCellRenderer.java | 1 + .../stigmata/ui/swing/ClasspathSettingsPane.java | 5 +++++ .../ui/swing/ClippedLRListCellRenderer.java | 1 + .../ui/swing/CompareTableCellRenderer.java | 1 + .../sourceforge/stigmata/ui/swing/ControlPane.java | 4 ++++ .../stigmata/ui/swing/ExtensionFilter.java | 2 ++ .../stigmata/ui/swing/ExtractedHistoryPane.java | 5 +++++ .../stigmata/ui/swing/FilterManagementPane.java | 7 +++++++ .../stigmata/ui/swing/FilterSelectionPane.java | 7 +++++++ .../sourceforge/stigmata/ui/swing/GUIUtility.java | 1 + .../stigmata/ui/swing/PairComparisonPane.java | 1 + .../ui/swing/PairComparisonResultSetPane.java | 3 +++ .../sourceforge/stigmata/ui/swing/PopupButton.java | 1 + .../stigmata/ui/swing/PropertyEditPane.java | 5 +++++ .../ui/swing/RoundRobinComparisonResultPane.java | 7 +++++++ .../stigmata/ui/swing/StigmataFrame.java | 13 ++++++++++++ .../stigmata/ui/swing/TargetSelectionPane.java | 13 +++++++++--- .../stigmata/ui/swing/UpdatePluginsPane.java | 11 ++++++++++- .../ui/swing/WellknownClassesSettingsPane.java | 8 ++++++++ .../ui/swing/actions/ChangeColorAction.java | 3 +++ .../stigmata/ui/swing/actions/LicenseAction.java | 2 ++ .../stigmata/ui/swing/actions/LinkFollower.java | 1 + .../ui/swing/actions/OpenSettingDirAction.java | 1 + .../stigmata/ui/swing/actions/SaveAction.java | 1 + .../stigmata/ui/swing/actions/ShowTextAction.java | 1 + .../actions/UpdateBirthmarkCellColorAction.java | 2 ++ ...stractComparisonPairFilterComponentService.java | 2 ++ ...tCountComparisonPairFilterComponentService.java | 7 +++++++ .../ui/swing/filter/FilterEditingPane.java | 3 +++ .../ui/swing/filter/FilterSetDefinitionPane.java | 12 +++++++++++ ...larityComparisonPairFilterComponentService.java | 6 ++++++ ...etNameComparisonPairFilterComponentService.java | 3 +++ ...tCountComparisonPairFilterComponentService.java | 3 +++ .../graph/SimilarityDistributionGraphPane.java | 2 ++ .../stigmata/ui/swing/mds/MdsImageExporter.java | 1 + .../ui/swing/mds/MdsItemsLocationExporter.java | 1 + .../stigmata/ui/swing/mds/MdsViewerPane.java | 6 ++++++ .../stigmata/ui/swing/mds/OpenItemsAction.java | 3 +++ .../stigmata/ui/swing/tab/EditableGlassPane.java | 1 + .../stigmata/ui/swing/tab/EditableTabbedPane.java | 4 ++++ .../sourceforge/stigmata/utils/ArrayIterator.java | 3 +++ .../stigmata/utils/ConfigFileExporter.java | 2 +- .../stigmata/utils/MultipleIterator.java | 3 +++ .../sourceforge/stigmata/utils/NullIterator.java | 3 +++ .../stigmata/utils/WellknownClassJudgeRule.java | 3 +++ .../stigmata/utils/WellknownClassManager.java | 3 +-- 167 files changed, 628 insertions(+), 12 deletions(-) diff --git a/src/main/java/jp/sourceforge/stigmata/Birthmark.java b/src/main/java/jp/sourceforge/stigmata/Birthmark.java index 529a585..f572eb0 100644 --- a/src/main/java/jp/sourceforge/stigmata/Birthmark.java +++ b/src/main/java/jp/sourceforge/stigmata/Birthmark.java @@ -25,6 +25,7 @@ public interface Birthmark extends Iterable{ * returns the iterator for all elements of this birthmark. * @return iterator for accessing to elements of this birthmark. */ + @Override public Iterator iterator(); /** diff --git a/src/main/java/jp/sourceforge/stigmata/BirthmarkElement.java b/src/main/java/jp/sourceforge/stigmata/BirthmarkElement.java index 0781c89..f4ea9ab 100644 --- a/src/main/java/jp/sourceforge/stigmata/BirthmarkElement.java +++ b/src/main/java/jp/sourceforge/stigmata/BirthmarkElement.java @@ -37,6 +37,7 @@ public class BirthmarkElement implements Serializable{ /** * to string. */ + @Override public String toString(){ return String.valueOf(getValue()); } @@ -44,6 +45,7 @@ public class BirthmarkElement implements Serializable{ /** * hash code for overriding equals method. */ + @Override public int hashCode(){ if(getValue() == null){ return 0; @@ -56,6 +58,7 @@ public class BirthmarkElement implements Serializable{ /** * equals method. */ + @Override public boolean equals(Object o){ if(o instanceof BirthmarkElement){ if(getValue() != null){ diff --git a/src/main/java/jp/sourceforge/stigmata/BirthmarkSet.java b/src/main/java/jp/sourceforge/stigmata/BirthmarkSet.java index c8f6b6f..b2ddf07 100644 --- a/src/main/java/jp/sourceforge/stigmata/BirthmarkSet.java +++ b/src/main/java/jp/sourceforge/stigmata/BirthmarkSet.java @@ -113,6 +113,7 @@ public class BirthmarkSet implements Iterable{ /** * returns an iterator over the birthmarks in this birthmark-set. */ + @Override public Iterator iterator(){ return birthmarks.values().iterator(); } diff --git a/src/main/java/jp/sourceforge/stigmata/BirthmarkSpiComparator.java b/src/main/java/jp/sourceforge/stigmata/BirthmarkSpiComparator.java index 32e8dde..07a0e10 100644 --- a/src/main/java/jp/sourceforge/stigmata/BirthmarkSpiComparator.java +++ b/src/main/java/jp/sourceforge/stigmata/BirthmarkSpiComparator.java @@ -19,10 +19,12 @@ class BirthmarkSpiComparator implements Comparator{ public BirthmarkSpiComparator(){ } + @Override public int hashCode(){ return System.identityHashCode(this); } + @Override public int compare(BirthmarkSpi s1, BirthmarkSpi s2){ if(s1.isExperimental() && !s2.isExperimental()){ return 1; @@ -35,6 +37,7 @@ class BirthmarkSpiComparator implements Comparator{ } } + @Override public boolean equals(Object o){ String className = null; if(o != null){ diff --git a/src/main/java/jp/sourceforge/stigmata/BirthmarkStoreTarget.java b/src/main/java/jp/sourceforge/stigmata/BirthmarkStoreTarget.java index d5ea0a8..b93e179 100644 --- a/src/main/java/jp/sourceforge/stigmata/BirthmarkStoreTarget.java +++ b/src/main/java/jp/sourceforge/stigmata/BirthmarkStoreTarget.java @@ -42,10 +42,12 @@ public class BirthmarkStoreTarget implements Serializable, Comparable{ /** * returns an iterator for comparing each birthmarks. */ + @Override public synchronized Iterator iterator(){ List list = new ArrayList(); BirthmarkEnvironment env = context.getEnvironment(); diff --git a/src/main/java/jp/sourceforge/stigmata/ComparisonPairFilterSet.java b/src/main/java/jp/sourceforge/stigmata/ComparisonPairFilterSet.java index d1976c6..11d22aa 100644 --- a/src/main/java/jp/sourceforge/stigmata/ComparisonPairFilterSet.java +++ b/src/main/java/jp/sourceforge/stigmata/ComparisonPairFilterSet.java @@ -91,6 +91,7 @@ public class ComparisonPairFilterSet implements Iterable{ return filters.get(index); } + @Override public Iterator iterator(){ return filters.iterator(); } @@ -103,6 +104,7 @@ public class ComparisonPairFilterSet implements Iterable{ return filters.size(); } + @Override public String toString(){ StringBuilder sb = new StringBuilder("filterset{ "); sb.append("name=").append(getName()).append(", "); diff --git a/src/main/java/jp/sourceforge/stigmata/ComparisonResultSet.java b/src/main/java/jp/sourceforge/stigmata/ComparisonResultSet.java index 15804e3..836a10f 100644 --- a/src/main/java/jp/sourceforge/stigmata/ComparisonResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/ComparisonResultSet.java @@ -26,6 +26,7 @@ public interface ComparisonResultSet extends Iterable{ /** * a iterator for {@link ComparisonPair ComparisonPair}. */ + @Override public Iterator iterator(); /** diff --git a/src/main/java/jp/sourceforge/stigmata/ExtractionResultSet.java b/src/main/java/jp/sourceforge/stigmata/ExtractionResultSet.java index efd4498..5cc20ca 100644 --- a/src/main/java/jp/sourceforge/stigmata/ExtractionResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/ExtractionResultSet.java @@ -53,6 +53,7 @@ public interface ExtractionResultSet extends Iterable{ /** * returns an iterator for all of birthmark-sets. */ + @Override public Iterator iterator(); /** diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmark.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmark.java index 5cda916..0af6cd3 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmark.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmark.java @@ -26,6 +26,7 @@ public abstract class AbstractBirthmark implements Birthmark, Serializable{ */ protected List elements = new ArrayList(); + @Override public void addElement(BirthmarkElement element){ elements.add(element); } @@ -33,6 +34,7 @@ public abstract class AbstractBirthmark implements Birthmark, Serializable{ /** * returns the number of elements. */ + @Override public int getElementCount(){ int numberOfElement = 0; BirthmarkElement[] elements = getElements(); @@ -46,6 +48,7 @@ public abstract class AbstractBirthmark implements Birthmark, Serializable{ * returns elements. * @return elements */ + @Override public BirthmarkElement[] getElements(){ return elements.toArray(new BirthmarkElement[elements.size()]); } @@ -53,6 +56,7 @@ public abstract class AbstractBirthmark implements Birthmark, Serializable{ /** * returns elements. */ + @Override public Iterator iterator(){ return elements.iterator(); } @@ -60,11 +64,13 @@ public abstract class AbstractBirthmark implements Birthmark, Serializable{ /** * returns the type of this birthmark. */ + @Override public abstract String getType(); /** * Is given birthmark the same type. */ + @Override public boolean isSameType(Birthmark b){ return getType().equals(b.getType()); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkExtractor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkExtractor.java index c826d5c..fcb56b0 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkExtractor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkExtractor.java @@ -43,6 +43,7 @@ public abstract class AbstractBirthmarkExtractor implements BirthmarkExtractor{ /** * returns the provider of this extractor. */ + @Override public BirthmarkSpi getProvider(){ return spi; } @@ -50,6 +51,7 @@ public abstract class AbstractBirthmarkExtractor implements BirthmarkExtractor{ /** * extract birthmark given stream with given environment. */ + @Override public final Birthmark extract(InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException{ return extract(createBirthmark(), in, context); } @@ -57,6 +59,7 @@ public abstract class AbstractBirthmarkExtractor implements BirthmarkExtractor{ /** * extract birthmark given byte array with given environment. */ + @Override public final Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException{ return extract(birthmark, new ByteArrayInputStream(bytecode), context); } @@ -64,6 +67,7 @@ public abstract class AbstractBirthmarkExtractor implements BirthmarkExtractor{ /** * extract birthmark given byte array with given environment. */ + @Override public final Birthmark extract(byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException{ return extract(createBirthmark(), new ByteArrayInputStream(bytecode), context); } @@ -71,18 +75,22 @@ public abstract class AbstractBirthmarkExtractor implements BirthmarkExtractor{ /** * extract birthmark given stream with given environment. */ + @Override public abstract Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException; /** * create birthmark. * @see jp.sourceforge.stigmata.BirthmarkExtractor#createBirthmark() */ + @Override public Birthmark createBirthmark(){ return new PlainBirthmark(getProvider().getType()); } + @Override public abstract ExtractionUnit[] getAcceptableUnits(); + @Override public boolean isAcceptable(ExtractionUnit unit){ ExtractionUnit[] units = getAcceptableUnits(); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkPreprocessor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkPreprocessor.java index 623492c..7e9ab77 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkPreprocessor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkPreprocessor.java @@ -23,5 +23,6 @@ public abstract class AbstractBirthmarkPreprocessor implements BirthmarkPreproce return service; } + @Override public abstract void preprocess(ClassFileArchive[] targets, BirthmarkContext context); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkService.java index 96235e9..ed33a1c 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkService.java @@ -21,10 +21,12 @@ import jp.sourceforge.stigmata.utils.LocalizedDescriptionManager; * @version $Revision$ */ public abstract class AbstractBirthmarkService implements BirthmarkSpi{ + @Override public String getDisplayType(){ return getDisplayType(Locale.getDefault()); } + @Override public String getDisplayType(Locale locale){ LocalizedDescriptionManager manager = LocalizedDescriptionManager.getInstance(); String type = manager.getDisplayType(locale, getType()); @@ -34,10 +36,12 @@ public abstract class AbstractBirthmarkService implements BirthmarkSpi{ return type; } + @Override public String getDescription(){ return getDescription(Locale.getDefault()); } + @Override public String getDescription(Locale locale){ LocalizedDescriptionManager manager = LocalizedDescriptionManager.getInstance(); String description = manager.getDescription(locale, getType()); @@ -47,22 +51,28 @@ public abstract class AbstractBirthmarkService implements BirthmarkSpi{ return description; } + @Override public abstract BirthmarkComparator getComparator(); + @Override public String getComparatorClassName(){ return getComparator().getClass().getName(); } + @Override public abstract BirthmarkExtractor getExtractor(); + @Override public String getExtractorClassName(){ return getExtractor().getClass().getName(); } + @Override public BirthmarkPreprocessor getPreprocessor(){ return null; } + @Override public String getPreprocessorClassName(){ BirthmarkPreprocessor preprocessor = getPreprocessor(); String name = null; @@ -72,30 +82,38 @@ public abstract class AbstractBirthmarkService implements BirthmarkSpi{ return name; } + @Override public abstract String getType(); + @Override public abstract String getDefaultDescription(); + @Override public boolean isExperimental(){ return true; } + @Override public boolean isUserDefined(){ return true; } + @Override public String getVersion(){ return getClass().getPackage().getImplementationVersion(); } + @Override public String getVendorName(){ return getClass().getPackage().getImplementationVendor(); } + @Override public Birthmark buildBirthmark(){ return getExtractor().createBirthmark(); } + @Override public BirthmarkElement buildBirthmarkElement(String value){ if(value == null || value.equals("")){ return NullBirthmarkElement.getInstance(); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkService.java index b3949c7..cabbbb3 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkService.java @@ -88,6 +88,7 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm this.displayType = displayType; } + @Override public String getDisplayType(){ return displayType; } @@ -96,6 +97,7 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm this.description = description; } + @Override public String getDescription(){ String desc = description; if(description == null){ @@ -112,6 +114,7 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm return description; } + @Override public String getExtractorClassName(){ return extractorClass.getName(); } @@ -119,6 +122,7 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(){ if(extractorObject == null){ try{ @@ -131,6 +135,7 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm return extractorObject; } + @Override public String getComparatorClassName(){ return comparatorClass.getName(); } @@ -138,6 +143,7 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm /** * returns a comparator for the birthmark of this service. */ + @Override public BirthmarkComparator getComparator(){ if(comparatorObject == null){ try{ @@ -150,6 +156,7 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm return comparatorObject; } + @Override public boolean isUserDefined(){ return userDefined; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/FrequencyBirthmark.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/FrequencyBirthmark.java index a0aa014..84001d9 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/FrequencyBirthmark.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/FrequencyBirthmark.java @@ -42,6 +42,7 @@ public class FrequencyBirthmark extends AbstractBirthmark{ index++; } Arrays.sort(elements, new Comparator(){ + @Override public int compare(FrequencyBirthmarkElement o1, FrequencyBirthmarkElement o2){ return o1.getValueName().compareTo(o2.getValueName()); } @@ -55,6 +56,7 @@ public class FrequencyBirthmark extends AbstractBirthmark{ return new ArrayIterator(getElements()); } + @Override public void addElement(BirthmarkElement element){ String value; if(element instanceof FrequencyBirthmarkElement){ diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/FrequencyBirthmarkElement.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/FrequencyBirthmarkElement.java index 93860ec..5178182 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/FrequencyBirthmarkElement.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/FrequencyBirthmarkElement.java @@ -62,10 +62,12 @@ public class FrequencyBirthmarkElement extends BirthmarkElement implements Value return hash; } + @Override public String getValueName(){ return (String)super.getValue(); } + @Override public int getValueCount(){ return count; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/NullBirthmarkElement.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/NullBirthmarkElement.java index 62812d9..fb74331 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/NullBirthmarkElement.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/NullBirthmarkElement.java @@ -25,14 +25,17 @@ public class NullBirthmarkElement extends BirthmarkElement{ return ELEMENT; } + @Override public int hashCode(){ return 0; } + @Override public boolean equals(Object o){ return o instanceof NullBirthmarkElement; } + @Override public String toString(){ return ""; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/AbstractBirthmarkComparator.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/AbstractBirthmarkComparator.java index 8a6752b..d2b2ac8 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/AbstractBirthmarkComparator.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/AbstractBirthmarkComparator.java @@ -30,12 +30,15 @@ public abstract class AbstractBirthmarkComparator implements BirthmarkComparator return spi; } + @Override public String getType(){ return spi.getType(); } + @Override public abstract double compare(Birthmark b1, Birthmark b2, BirthmarkContext context); + @Override public int getCompareCount(Birthmark b1, Birthmark b2){ return b1.getElementCount() + b2.getElementCount(); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/AbstractBirthmarkComparatorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/AbstractBirthmarkComparatorService.java index 453d599..c26d7b1 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/AbstractBirthmarkComparatorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/AbstractBirthmarkComparatorService.java @@ -24,11 +24,13 @@ abstract class AbstractBirthmarkComparatorService extends AbstractServiceProvide /** * returns a type of the birthmark this service provides. */ + @Override public abstract String getType(); /** * returns a localized description of the birthmark this service provides. */ + @Override public String getDescription(Locale locale){ return LocalizedDescriptionManager.getInstance().getDescription( locale, getType(), LocalizedDescriptionManager.ServiceCategory.comparator @@ -38,15 +40,18 @@ abstract class AbstractBirthmarkComparatorService extends AbstractServiceProvide /** * returns a localized description of the birthmark in default locale. */ + @Override public String getDescription(){ return getDescription(Locale.getDefault()); } + @Override public abstract String getComparatorClassName(); /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkComparator getComparator(BirthmarkSpi service){ try{ Class c = Class.forName(getComparatorClassName()); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/CosineSimilarityBirthmarkComparator.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/CosineSimilarityBirthmarkComparator.java index 7945b72..0bfe293 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/CosineSimilarityBirthmarkComparator.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/CosineSimilarityBirthmarkComparator.java @@ -28,6 +28,7 @@ public class CosineSimilarityBirthmarkComparator extends super(spi); } + @Override public double compare(Birthmark b1, Birthmark b2, BirthmarkContext context){ if(!b1.getType().equals(b2.getType())){ return Double.NaN; @@ -111,7 +112,6 @@ public class CosineSimilarityBirthmarkComparator extends /** * This method is used for debugging. */ - @SuppressWarnings("unused") private void printAll(Map pairs){ System.out.println("----------"); for(Map.Entry entry: pairs.entrySet()){ diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/CosineSimilarityBirthmarkComparatorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/CosineSimilarityBirthmarkComparatorService.java index ff89d00..6516008 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/CosineSimilarityBirthmarkComparatorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/CosineSimilarityBirthmarkComparatorService.java @@ -18,10 +18,12 @@ public class CosineSimilarityBirthmarkComparatorService extends AbstractBirthmar /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "cosine"; } + @Override public String getComparatorClassName(){ return CosineSimilarityBirthmarkComparator.class.getName(); } @@ -29,6 +31,7 @@ public class CosineSimilarityBirthmarkComparatorService extends AbstractBirthmar /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkComparator getComparator(BirthmarkSpi service){ return new CosineSimilarityBirthmarkComparator(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/DPMatchingBirthmarkComparator.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/DPMatchingBirthmarkComparator.java index d988f75..cf9eb2a 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/DPMatchingBirthmarkComparator.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/DPMatchingBirthmarkComparator.java @@ -39,6 +39,7 @@ public class DPMatchingBirthmarkComparator extends AbstractBirthmarkComparator{ this.shiftPenalty = shiftPenalty; } + @Override public double compare(Birthmark b1, Birthmark b2, BirthmarkContext context){ if(!b1.getType().equals(b2.getType())){ return Double.NaN; @@ -62,6 +63,7 @@ public class DPMatchingBirthmarkComparator extends AbstractBirthmarkComparator{ } } + @Override public int getCompareCount(Birthmark b1, Birthmark b2){ return b1.getElementCount() + b2.getElementCount(); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/DPMatchingBirthmarkComparatorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/DPMatchingBirthmarkComparatorService.java index 2cf731d..46cce1a 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/DPMatchingBirthmarkComparatorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/DPMatchingBirthmarkComparatorService.java @@ -18,10 +18,12 @@ public class DPMatchingBirthmarkComparatorService extends AbstractBirthmarkCompa /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "dpmatching"; } + @Override public String getComparatorClassName(){ return DPMatchingBirthmarkComparator.class.getName(); } @@ -29,6 +31,7 @@ public class DPMatchingBirthmarkComparatorService extends AbstractBirthmarkCompa /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkComparator getComparator(BirthmarkSpi service){ return new DPMatchingBirthmarkComparator(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/EditDistanceBirthmarkComparator.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/EditDistanceBirthmarkComparator.java index 173b8ed..dd887b7 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/EditDistanceBirthmarkComparator.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/EditDistanceBirthmarkComparator.java @@ -21,6 +21,7 @@ public class EditDistanceBirthmarkComparator extends AbstractBirthmarkComparator super(spi); } + @Override public double compare(Birthmark b1, Birthmark b2, BirthmarkContext context){ if(!b1.getType().equals(b2.getType())){ return Double.NaN; diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/EditDistanceBirthmarkComparatorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/EditDistanceBirthmarkComparatorService.java index 06b2143..e400468 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/EditDistanceBirthmarkComparatorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/EditDistanceBirthmarkComparatorService.java @@ -18,10 +18,12 @@ public class EditDistanceBirthmarkComparatorService extends AbstractBirthmarkCom /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "editdistancee"; } + @Override public String getComparatorClassName(){ return EditDistanceBirthmarkComparator.class.getName(); } @@ -29,6 +31,7 @@ public class EditDistanceBirthmarkComparatorService extends AbstractBirthmarkCom /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkComparator getComparator(BirthmarkSpi service){ return new EditDistanceBirthmarkComparator(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/ExtendedEditDistanceBirthmarkComparatorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/ExtendedEditDistanceBirthmarkComparatorService.java index 1a341e4..4ae7847 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/ExtendedEditDistanceBirthmarkComparatorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/ExtendedEditDistanceBirthmarkComparatorService.java @@ -18,10 +18,12 @@ public class ExtendedEditDistanceBirthmarkComparatorService extends AbstractBirt /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "editdistanceext"; } + @Override public String getComparatorClassName(){ return ExtendedEditDistanceBirthmarkComparator.class.getName(); } @@ -29,6 +31,7 @@ public class ExtendedEditDistanceBirthmarkComparatorService extends AbstractBirt /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkComparator getComparator(BirthmarkSpi service){ return new ExtendedEditDistanceBirthmarkComparator(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/LogicalAndBirthmarkComparator.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/LogicalAndBirthmarkComparator.java index bb7e79d..96d8b54 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/LogicalAndBirthmarkComparator.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/LogicalAndBirthmarkComparator.java @@ -25,6 +25,7 @@ public class LogicalAndBirthmarkComparator extends AbstractBirthmarkComparator{ super(spi); } + @Override public double compare(Birthmark b1, Birthmark b2, BirthmarkContext context){ if(!b1.getType().equals(b2.getType())){ return Double.NaN; @@ -55,6 +56,7 @@ public class LogicalAndBirthmarkComparator extends AbstractBirthmarkComparator{ return similarity; } + @Override public int getCompareCount(Birthmark b1, Birthmark b2){ return b1.getElementCount() + b2.getElementCount(); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/LogicalAndBirthmarkComparatorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/LogicalAndBirthmarkComparatorService.java index 23a33fd..6947c2e 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/LogicalAndBirthmarkComparatorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/LogicalAndBirthmarkComparatorService.java @@ -18,10 +18,12 @@ public class LogicalAndBirthmarkComparatorService extends AbstractBirthmarkCompa /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "and"; } + @Override public String getComparatorClassName(){ return LogicalAndBirthmarkComparator.class.getName(); } @@ -29,6 +31,7 @@ public class LogicalAndBirthmarkComparatorService extends AbstractBirthmarkCompa /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkComparator getComparator(BirthmarkSpi service){ return new LogicalAndBirthmarkComparator(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/PlainBirthmarkComparator.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/PlainBirthmarkComparator.java index 3fb0917..814d705 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/PlainBirthmarkComparator.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/PlainBirthmarkComparator.java @@ -26,6 +26,7 @@ public class PlainBirthmarkComparator extends AbstractBirthmarkComparator{ super(spi); } + @Override public double compare(Birthmark b1, Birthmark b2, BirthmarkContext context){ if(!b1.getType().equals(b2.getType())){ return Double.NaN; @@ -48,6 +49,7 @@ public class PlainBirthmarkComparator extends AbstractBirthmarkComparator{ return similarity; } + @Override public int getCompareCount(Birthmark b1, Birthmark b2){ return b1.getElementCount() + b2.getElementCount(); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/PlainBirthmarkComparatorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/PlainBirthmarkComparatorService.java index 842138a..3086b55 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/PlainBirthmarkComparatorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/comparators/PlainBirthmarkComparatorService.java @@ -18,10 +18,12 @@ public class PlainBirthmarkComparatorService extends AbstractBirthmarkComparator /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "plain"; } + @Override public String getComparatorClassName(){ return PlainBirthmarkComparator.class.getName(); } @@ -29,6 +31,7 @@ public class PlainBirthmarkComparatorService extends AbstractBirthmarkComparator /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkComparator getComparator(BirthmarkSpi service){ return new PlainBirthmarkComparator(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java index ff728e0..664bb29 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java @@ -33,6 +33,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma super(visitor, birthmark, context); } + @Override public void visitEnd(){ for(String key: elements.keySet()){ addElement(elements.get(key)); @@ -40,6 +41,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma super.visitEnd(); } + @Override public void visit(int version, int access, String name, String signature, String superName, String[] interfaces){ this.className = name; @@ -67,6 +69,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma return visitor; } + @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions){ MethodVisitor visitor = super.visitMethod(access, name, desc, signature, exceptions); @@ -75,6 +78,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma visitor = new MethodAdapter(visitor){ private Object constant = null; + @Override public void visitIntInsn(int opcode, int operand){ if(opcode == Opcodes.BIPUSH || opcode == Opcodes.SIPUSH){ constant = new Integer(operand); @@ -82,6 +86,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma super.visitIntInsn(opcode, operand); } + @Override public void visitMethodInsn(int opcode, String owner, String name, String desc){ Type type = Type.getReturnType(desc); if(!type.equals(Type.VOID_TYPE)){ @@ -90,6 +95,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma super.visitMethodInsn(opcode, owner, name, desc); } + @Override public void visitInsn(int opcode){ if(opcode == Opcodes.ICONST_M1) constant = new Integer(-1); else if(opcode == Opcodes.ICONST_0) constant = new Integer(0); @@ -109,11 +115,13 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma super.visitInsn(opcode); } + @Override public void visitLdcInsn(Object object){ constant = object; super.visitLdcInsn(object); } + @Override public void visitFieldInsn(int opcode, String owner, String name, String desc){ if(className.equals(owner) && opcode == Opcodes.PUTFIELD){ TypeAndValueBirthmarkElement e = elements.get(name); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java index 4f076b1..ffe5cdd 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java @@ -32,6 +32,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractor extends ASMBirthmark return new ConstantValueOfFieldVariableBirthmarkExtractVisitor(writer, birthmark, context); } + @Override public ExtractionUnit[] getAcceptableUnits(){ return new ExtractionUnit[] { ExtractionUnit.CLASS, ExtractionUnit.PACKAGE, ExtractionUnit.ARCHIVE, diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkService.java index a956a5e..7efa926 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkService.java @@ -22,26 +22,32 @@ public class ConstantValueOfFieldVariableBirthmarkService extends AbstractBirthm private BirthmarkComparator comparator = new PlainBirthmarkComparator(this); private BirthmarkExtractor extractor = new ConstantValueOfFieldVariableBirthmarkExtractor(this); + @Override public String getType(){ return "cvfv"; } + @Override public String getDefaultDescription(){ return "Field type and its initial value."; } + @Override public BirthmarkExtractor getExtractor(){ return extractor; } + @Override public BirthmarkComparator getComparator(){ return comparator; } + @Override public boolean isExperimental(){ return false; } + @Override public boolean isUserDefined(){ return false; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/TypeAndValueBirthmarkElement.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/TypeAndValueBirthmarkElement.java index 898e654..f6ce897 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/TypeAndValueBirthmarkElement.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/TypeAndValueBirthmarkElement.java @@ -55,18 +55,22 @@ public class TypeAndValueBirthmarkElement extends BirthmarkElement implements Se } } + @Override public Object getValue(){ return value; } + @Override public String toString(){ return signature + "=" + value; } + @Override public int hashCode(){ return signature.hashCode() + value.hashCode(); } + @Override public boolean equals(Object o){ if(o instanceof TypeAndValueBirthmarkElement){ TypeAndValueBirthmarkElement tvbe = (TypeAndValueBirthmarkElement)o; diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/AbstractBirthmarkExtractorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/AbstractBirthmarkExtractorService.java index 20306c7..f337fca 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/AbstractBirthmarkExtractorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/AbstractBirthmarkExtractorService.java @@ -24,11 +24,13 @@ public abstract class AbstractBirthmarkExtractorService extends AbstractServiceP /** * returns a type of the birthmark this service provides. */ + @Override public abstract String getType(); /** * returns a localized description of the birthmark this service provides. */ + @Override public String getDescription(Locale locale){ return LocalizedDescriptionManager.getInstance().getDescription( locale, getType(), LocalizedDescriptionManager.ServiceCategory.extractor @@ -38,15 +40,18 @@ public abstract class AbstractBirthmarkExtractorService extends AbstractServiceP /** * returns a localized description of the birthmark in default locale. */ + @Override public String getDescription(){ return getDescription(Locale.getDefault()); } + @Override public abstract String getExtractorClassName(); /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(BirthmarkSpi service){ try{ Class c = Class.forName(getExtractorClassName()); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/BirthmarkExtractorFactory.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/BirthmarkExtractorFactory.java index 9745c42..53d64cc 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/BirthmarkExtractorFactory.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/BirthmarkExtractorFactory.java @@ -37,7 +37,7 @@ public class BirthmarkExtractorFactory{ return extractor; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private BirthmarkExtractor buildExtractor(String birthmarkType) throws ExtractorNotFoundException{ BirthmarkSpi spi = environment.getService(birthmarkType); BirthmarkExtractor extractor = null; diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/ConstantValueOfFieldVariableBirthmarkExtractorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/ConstantValueOfFieldVariableBirthmarkExtractorService.java index 1b2ee29..c801029 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/ConstantValueOfFieldVariableBirthmarkExtractorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/ConstantValueOfFieldVariableBirthmarkExtractorService.java @@ -19,10 +19,12 @@ public class ConstantValueOfFieldVariableBirthmarkExtractorService extends Abstr /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "cvfv"; } + @Override public String getExtractorClassName(){ return ConstantValueOfFieldVariableBirthmarkExtractor.class.getName(); } @@ -30,6 +32,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractorService extends Abstr /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(BirthmarkSpi service){ return new ConstantValueOfFieldVariableBirthmarkExtractor(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/FrequencyMethodCallBirthmarkExtractorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/FrequencyMethodCallBirthmarkExtractorService.java index 0de31a1..b718ec3 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/FrequencyMethodCallBirthmarkExtractorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/FrequencyMethodCallBirthmarkExtractorService.java @@ -19,10 +19,12 @@ public class FrequencyMethodCallBirthmarkExtractorService extends AbstractBirthm /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "fmc"; } + @Override public String getExtractorClassName(){ return FrequencyMethodCallBirthmarkExtractor.class.getName(); } @@ -30,6 +32,7 @@ public class FrequencyMethodCallBirthmarkExtractorService extends AbstractBirthm /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(BirthmarkSpi service){ return new FrequencyMethodCallBirthmarkExtractor(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/FrequencyUsedClassesBirthmarkExtractorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/FrequencyUsedClassesBirthmarkExtractorService.java index f6cfda1..f0f6478 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/FrequencyUsedClassesBirthmarkExtractorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/FrequencyUsedClassesBirthmarkExtractorService.java @@ -19,10 +19,12 @@ public class FrequencyUsedClassesBirthmarkExtractorService extends AbstractBirth /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "fuc"; } + @Override public String getExtractorClassName(){ return FrequencyUsedClassesBirthmarkExtractor.class.getName(); } @@ -30,6 +32,7 @@ public class FrequencyUsedClassesBirthmarkExtractorService extends AbstractBirth /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(BirthmarkSpi service){ return new FrequencyUsedClassesBirthmarkExtractor(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/InheritanceStructureBirthmarkExtractorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/InheritanceStructureBirthmarkExtractorService.java index 206315d..417d338 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/InheritanceStructureBirthmarkExtractorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/InheritanceStructureBirthmarkExtractorService.java @@ -19,10 +19,12 @@ public class InheritanceStructureBirthmarkExtractorService extends AbstractBirth /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "is"; } + @Override public String getExtractorClassName(){ return InheritanceStructureBirthmarkExtractor.class.getName(); } @@ -30,6 +32,7 @@ public class InheritanceStructureBirthmarkExtractorService extends AbstractBirth /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(BirthmarkSpi service){ return new InheritanceStructureBirthmarkExtractor(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/KGramBasedBirthmarkExtractorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/KGramBasedBirthmarkExtractorService.java index b6b0679..7fe9728 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/KGramBasedBirthmarkExtractorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/KGramBasedBirthmarkExtractorService.java @@ -19,10 +19,12 @@ public class KGramBasedBirthmarkExtractorService extends AbstractBirthmarkExtrac /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "kgram"; } + @Override public String getExtractorClassName(){ return KGramBasedBirthmarkExtractor.class.getName(); } @@ -30,6 +32,7 @@ public class KGramBasedBirthmarkExtractorService extends AbstractBirthmarkExtrac /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(BirthmarkSpi service){ return new KGramBasedBirthmarkExtractor(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/SequentialMethodCallBirthmarkExtractorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/SequentialMethodCallBirthmarkExtractorService.java index 5633313..555f04a 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/SequentialMethodCallBirthmarkExtractorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/SequentialMethodCallBirthmarkExtractorService.java @@ -19,10 +19,12 @@ public class SequentialMethodCallBirthmarkExtractorService extends AbstractBirth /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "smc"; } + @Override public String getExtractorClassName(){ return SequentialMethodCallBirthmarkExtractor.class.getName(); } @@ -30,6 +32,7 @@ public class SequentialMethodCallBirthmarkExtractorService extends AbstractBirth /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(BirthmarkSpi service){ return new SequentialMethodCallBirthmarkExtractor(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/UsedClassesBirthmarkExtractorService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/UsedClassesBirthmarkExtractorService.java index 97d35d2..33b396a 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/UsedClassesBirthmarkExtractorService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/extractors/UsedClassesBirthmarkExtractorService.java @@ -19,10 +19,12 @@ public class UsedClassesBirthmarkExtractorService extends AbstractBirthmarkExtra /** * returns a type of the birthmark this service provides. */ + @Override public String getType(){ return "uc"; } + @Override public String getExtractorClassName(){ return UsedClassesBirthmarkExtractor.class.getName(); } @@ -30,6 +32,7 @@ public class UsedClassesBirthmarkExtractorService extends AbstractBirthmarkExtra /** * returns a extractor for the birthmark of this service. */ + @Override public BirthmarkExtractor getExtractor(BirthmarkSpi service){ return new UsedClassesBirthmarkExtractor(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java index 14eb514..96b660f 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java @@ -39,6 +39,7 @@ public class FrequencyMethodCallBirthmarkExtractor extends ASMBirthmarkExtractor }; } + @Override public ExtractionUnit[] getAcceptableUnits(){ return new ExtractionUnit[] { ExtractionUnit.CLASS, ExtractionUnit.PACKAGE, ExtractionUnit.ARCHIVE, diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkService.java index b15ebd6..0c68ca5 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkService.java @@ -23,26 +23,32 @@ public class FrequencyMethodCallBirthmarkService extends AbstractBirthmarkServic private BirthmarkComparator comparator = new CosineSimilarityBirthmarkComparator(this); private BirthmarkExtractor extractor = new FrequencyMethodCallBirthmarkExtractor(this); + @Override public String getType(){ return "fmc"; } + @Override public String getDefaultDescription(){ return "Frequency of method call which order is appeared in method definition."; } + @Override public BirthmarkExtractor getExtractor(){ return extractor; } + @Override public BirthmarkComparator getComparator(){ return comparator; } + @Override public boolean isExperimental(){ return false; } + @Override public boolean isUserDefined(){ return false; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkService.java index d7721d3..c7d6513 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkService.java @@ -23,26 +23,32 @@ public class FrequencyUsedClassesBirthmarkService extends AbstractBirthmarkServi private BirthmarkComparator comparator = new CosineSimilarityBirthmarkComparator(this); private BirthmarkExtractor extractor = new FrequencyUsedClassesBirthmarkExtractor(this); + @Override public String getType(){ return "fuc"; } + @Override public String getDefaultDescription(){ return "Frequency of used classes in target class."; } + @Override public BirthmarkExtractor getExtractor(){ return extractor; } + @Override public BirthmarkComparator getComparator(){ return comparator; } + @Override public boolean isExperimental(){ return false; } + @Override public boolean isUserDefined(){ return false; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java index 5d75775..5f095c2 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java @@ -25,6 +25,7 @@ public class InheritanceStructureBirthmarkExtractVisitor extends BirthmarkExtrac super(visitor, birthmark, context); } + @Override public void visit(int version, int access, String name, String signature, String superName, String[] interfaces){ try { diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java index d10eab2..1313460 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java @@ -66,6 +66,7 @@ public class InheritanceStructureBirthmarkExtractor extends AbstractBirthmarkExt return birthmark; } + @Override public ExtractionUnit[] getAcceptableUnits(){ return new ExtractionUnit[] { ExtractionUnit.CLASS, }; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkService.java index 18fccfd..c677cb5 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkService.java @@ -21,26 +21,32 @@ public class InheritanceStructureBirthmarkService extends AbstractBirthmarkServi private BirthmarkComparator comparator = new PlainBirthmarkComparator(this); private BirthmarkExtractor extractor = new InheritanceStructureBirthmarkExtractor(this); + @Override public String getType(){ return "is"; } + @Override public String getDefaultDescription(){ return "Inheritance sequence to root class and user classes is replaced to ."; } + @Override public BirthmarkExtractor getExtractor(){ return extractor; } + @Override public BirthmarkComparator getComparator(){ return comparator; } + @Override public boolean isExperimental(){ return false; } + @Override public boolean isUserDefined(){ return false; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGram.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGram.java index 2da9bae..0c5a972 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGram.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGram.java @@ -47,6 +47,7 @@ public class KGram implements Serializable{ /** * returns string representation of this object. */ + @Override public String toString(){ StringBuffer buffer = new StringBuffer("{ "); for(int i = 0; i < maxLength; i++){ @@ -130,10 +131,10 @@ public class KGram implements Serializable{ return newarray; } - @SuppressWarnings("unchecked") + @Override public boolean equals(Object o){ if(o instanceof KGram){ - KGram kgram = (KGram)o; + KGram kgram = (KGram)o; boolean flag = getKValue() == kgram.getKValue(); for(int i = 0; !flag && i < maxLength; i++){ if(!get(i).equals(kgram.get(i))){ @@ -146,6 +147,7 @@ public class KGram implements Serializable{ return false; } + @Override public int hashCode(){ return Arrays.hashCode(values); } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkElement.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkElement.java index f4e1f55..ea95599 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkElement.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkElement.java @@ -21,12 +21,14 @@ public class KGramBasedBirthmarkElement extends BirthmarkElement{ this.kgram = kgram; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("rawtypes") public boolean equals(Object o){ return o instanceof KGramBasedBirthmarkElement && kgram.equals(((KGramBasedBirthmarkElement)o).kgram); } + @Override public int hashCode(){ int v = kgram.hashCode(); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java index 88832bc..48ba330 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java @@ -35,6 +35,7 @@ public class KGramBasedBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ this.kvalue = kvalue; } + @Override public void visitEnd(){ KGramBuilder builder = KGramBuilder.getInstance(); KGram[] kgrams = builder.buildKGram(opcodes, getKValue()); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java index 6da4c07..fc785be 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java @@ -43,6 +43,7 @@ public class KGramBasedBirthmarkExtractor extends ASMBirthmarkExtractor{ return extractor; } + @Override public ExtractionUnit[] getAcceptableUnits(){ return new ExtractionUnit[] { ExtractionUnit.CLASS, ExtractionUnit.PACKAGE, ExtractionUnit.ARCHIVE, diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkService.java index 66f172e..d378728 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkService.java @@ -22,26 +22,32 @@ public class KGramBasedBirthmarkService extends AbstractBirthmarkService impleme private BirthmarkComparator comparator = new LogicalAndBirthmarkComparator(this); private BirthmarkExtractor extractor = new KGramBasedBirthmarkExtractor(this); + @Override public String getType(){ return "kgram"; } + @Override public String getDefaultDescription(){ return "k-gram based birthmark."; } + @Override public BirthmarkExtractor getExtractor(){ return extractor; } + @Override public BirthmarkComparator getComparator(){ return comparator; } + @Override public boolean isExperimental(){ return false; } + @Override public boolean isUserDefined(){ return false; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/MethodCallBirthmarkElement.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/MethodCallBirthmarkElement.java index 1fc312a..55b1159 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/MethodCallBirthmarkElement.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/MethodCallBirthmarkElement.java @@ -40,14 +40,17 @@ public class MethodCallBirthmarkElement extends BirthmarkElement implements Seri return signature; } + @Override public Object getValue(){ return getClassName() + "#" + getMethodName() + "!" + getSignature(); } + @Override public int hashCode(){ return System.identityHashCode(this); } + @Override public boolean equals(Object o){ boolean flag = false; if(o instanceof MethodCallBirthmarkElement){ diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java index 04da9f3..19e1087 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java @@ -24,12 +24,14 @@ public class SequentialMethodCallBirthmarkExtractVisitor extends BirthmarkExtrac super(visitor, birthmark, context); } + @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions){ MethodVisitor visitor = super.visitMethod(access, name, desc, signature, exceptions); return new MethodAdapter(visitor){ + @Override public void visitMethodInsn(int opcode, String owner, String name, String desc){ String className = owner.replace('/', '.'); if(getEnvironment().getWellknownClassManager().isWellKnownClass(className)){ diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkService.java index 802a700..5b6ee46 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkService.java @@ -22,26 +22,32 @@ public class SequentialMethodCallBirthmarkService extends AbstractBirthmarkServi private BirthmarkComparator comparator = new PlainBirthmarkComparator(this); private BirthmarkExtractor extractor = new SequentialMethodCallBirthmarkExtractor(this); + @Override public String getType(){ return "smc"; } + @Override public String getDefaultDescription(){ return "Sequence of method call which order is appeared in method definition."; } + @Override public BirthmarkExtractor getExtractor(){ return extractor; } + @Override public BirthmarkComparator getComparator(){ return comparator; } + @Override public boolean isExperimental(){ return false; } + @Override public boolean isUserDefined(){ return false; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java index db7240c..8a254d6 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java @@ -29,6 +29,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ super(visitor, birthmark, context); } + @Override public void visit(int version, int access, String name, String signature, String superName, String[] interfaces){ addSignatureClass(signature); @@ -43,6 +44,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ } } + @Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value){ FieldVisitor visitor = super.visitField(access, name, desc, signature, value); @@ -53,6 +55,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ return visitor; } + @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions){ if(exceptions != null){ @@ -68,6 +71,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ MethodVisitor visitor = super.visitMethod(access, name, desc, signature, exceptions); return new MethodAdapter(visitor){ + @Override public void visitTypeInsn(int opcode, String desc){ Type type = Type.getType("L" + desc + ";"); if(checkType(type)){ @@ -76,6 +80,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ super.visitTypeInsn(opcode, desc); } + @Override public void visitTryCatchBlock(Label start, Label end, Label handle, String desc){ Type type = Type.getType("L" + desc + ";"); if(checkType(type)){ @@ -84,6 +89,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ super.visitTryCatchBlock(start, end, handle, desc); } + @Override public void visitMultiANewArrayInsn(String desc, int dims){ Type type = Type.getType(desc); if(checkType(type)){ @@ -92,6 +98,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ super.visitMultiANewArrayInsn(desc, dims); } + @Override public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index){ if(checkType(Type.getType(desc))){ @@ -102,6 +109,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ super.visitLocalVariable(name, desc, signature, start, end, index); } + @Override public void visitFieldInsn(int opcode, String owner, String name, String desc){ if(getEnvironment().getWellknownClassManager().isWellKnownClass(owner)){ add(owner); @@ -109,6 +117,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ addDescriptor(desc); super.visitFieldInsn(opcode, owner, name, desc); } + @Override public void visitMethodInsn(int opcode, String owner, String name, String desc){ String className = normalize(owner); if(getEnvironment().getWellknownClassManager().isWellKnownClass(className)){ @@ -124,6 +133,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ if(signature != null){ SignatureReader in = new SignatureReader(signature); SignatureWriter writer = new SignatureWriter(){ + @Override public void visitClassType(String classType){ if(getEnvironment().getWellknownClassManager().isWellKnownClass(classType)){ add(classType); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java index e9a940e..203f10e 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java @@ -32,6 +32,7 @@ public class UsedClassesBirthmarkExtractor extends ASMBirthmarkExtractor{ return new UsedClassesBirthmarkExtractVisitor(writer, birthmark, context); } + @Override public ExtractionUnit[] getAcceptableUnits(){ return new ExtractionUnit[] { ExtractionUnit.CLASS, ExtractionUnit.PACKAGE, ExtractionUnit.ARCHIVE, diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkService.java index 5a834f5..a274fdb 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkService.java @@ -21,26 +21,32 @@ public class UsedClassesBirthmarkService extends AbstractBirthmarkService implem private BirthmarkComparator comparator = new LogicalAndBirthmarkComparator(this); private BirthmarkExtractor extractor = new UsedClassesBirthmarkExtractor(this); + @Override public String getType(){ return "uc"; } + @Override public String getDefaultDescription(){ return "Set of used classes in target class."; } + @Override public BirthmarkExtractor getExtractor(){ return extractor; } + @Override public BirthmarkComparator getComparator(){ return comparator; } + @Override public boolean isExperimental(){ return false; } + @Override public boolean isUserDefined(){ return false; } diff --git a/src/main/java/jp/sourceforge/stigmata/command/AbstractStigmataCommand.java b/src/main/java/jp/sourceforge/stigmata/command/AbstractStigmataCommand.java index 931f7a5..e49292c 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/AbstractStigmataCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/AbstractStigmataCommand.java @@ -19,21 +19,26 @@ public abstract class AbstractStigmataCommand implements StigmataCommand{ /** * {@link perform(Stigmata, BirthmarkContext, String[]) perform(stigmata, stigmata.createContext(), args)}. */ + @Override public void perform(Stigmata stigmata, String[] args){ perform(stigmata, stigmata.createContext(), args); } + @Override public boolean isAvailableArguments(String[] args){ return true; } + @Override public void setUp(BirthmarkEnvironment env){ StigmataHookManager.getInstance().runHook(Phase.SETUP, env); } + @Override public void tearDown(BirthmarkEnvironment env){ StigmataHookManager.getInstance().runHook(Phase.TEAR_DOWN, env); } + @Override public abstract String getCommandString(); } diff --git a/src/main/java/jp/sourceforge/stigmata/command/CompareCommand.java b/src/main/java/jp/sourceforge/stigmata/command/CompareCommand.java index fffa601..50f0cf3 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/CompareCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/CompareCommand.java @@ -25,6 +25,7 @@ import jp.sourceforge.stigmata.spi.ResultPrinterSpi; * @version $Revision$ */ public class CompareCommand extends AbstractStigmataCommand{ + @Override public boolean isAvailableArguments(String[] args){ return args.length > 0; } @@ -34,11 +35,13 @@ public class CompareCommand extends AbstractStigmataCommand{ return "compare"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ try{ BirthmarkEngine engine = new BirthmarkEngine(context.getEnvironment()); context.setComparisonMethod(ComparisonMethod.ROUND_ROBIN_SAME_PAIR); engine.addBirthmarkEngineListener(new BirthmarkEngineAdapter(){ + @Override public void operationDone(BirthmarkEngineEvent e){ WarningMessages warnings = e.getMessage(); for(Iterator i = warnings.exceptions(); i.hasNext(); ){ diff --git a/src/main/java/jp/sourceforge/stigmata/command/ExportConfigCommand.java b/src/main/java/jp/sourceforge/stigmata/command/ExportConfigCommand.java index 60a577b..b3d0ec2 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/ExportConfigCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/ExportConfigCommand.java @@ -24,6 +24,7 @@ public class ExportConfigCommand extends AbstractStigmataCommand{ return "export-config"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ try{ PrintWriter out; diff --git a/src/main/java/jp/sourceforge/stigmata/command/ExtractCommand.java b/src/main/java/jp/sourceforge/stigmata/command/ExtractCommand.java index 0e10523..448886c 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/ExtractCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/ExtractCommand.java @@ -24,6 +24,7 @@ import jp.sourceforge.stigmata.spi.ResultPrinterSpi; * @version $Revision$ */ public class ExtractCommand extends AbstractStigmataCommand{ + @Override public boolean isAvailableArguments(String[] args){ return args.length > 0; } @@ -33,12 +34,14 @@ public class ExtractCommand extends AbstractStigmataCommand{ return "extract"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ try{ context.setComparisonMethod(ComparisonMethod.ROUND_ROBIN_SAME_PAIR); BirthmarkEngine engine = new BirthmarkEngine(context.getEnvironment()); engine.addBirthmarkEngineListener(new BirthmarkEngineAdapter(){ + @Override public void operationDone(BirthmarkEngineEvent e){ WarningMessages warnings = e.getMessage(); for(Iterator i = warnings.exceptions(); i.hasNext(); ){ diff --git a/src/main/java/jp/sourceforge/stigmata/command/GuiCommand.java b/src/main/java/jp/sourceforge/stigmata/command/GuiCommand.java index 753f6a8..d5ace30 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/GuiCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/GuiCommand.java @@ -17,6 +17,7 @@ import jp.sourceforge.stigmata.ui.swing.StigmataFrame; * @version $Revision$ */ public class GuiCommand extends AbstractStigmataCommand{ + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ StigmataFrame frame = new StigmataFrame(stigmata, context.getEnvironment()); frame.setVisible(true); @@ -30,6 +31,7 @@ public class GuiCommand extends AbstractStigmataCommand{ @Override public void tearDown(final BirthmarkEnvironment env){ Runtime.getRuntime().addShutdownHook(new Thread(){ + @Override public void run(){ StigmataHookManager.getInstance().runHook( Phase.TEAR_DOWN, env diff --git a/src/main/java/jp/sourceforge/stigmata/command/HelpCommand.java b/src/main/java/jp/sourceforge/stigmata/command/HelpCommand.java index bfb642d..70019ae 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/HelpCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/HelpCommand.java @@ -34,6 +34,7 @@ public class HelpCommand extends AbstractStigmataCommand{ return "help"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ BirthmarkEnvironment env = context.getEnvironment(); Package p = getClass().getPackage(); diff --git a/src/main/java/jp/sourceforge/stigmata/command/InstallCommand.java b/src/main/java/jp/sourceforge/stigmata/command/InstallCommand.java index a3092b1..c3c4413 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/InstallCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/InstallCommand.java @@ -22,6 +22,7 @@ import jp.sourceforge.stigmata.utils.Utility; * @version $Revision$ */ public class InstallCommand extends AbstractStigmataCommand{ + @Override public boolean isAvailableArguments(String[] args){ return args.length > 0; } @@ -31,6 +32,7 @@ public class InstallCommand extends AbstractStigmataCommand{ return "install"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ File pluginsDir = new File(BirthmarkEnvironment.getStigmataHome(), "plugins"); BirthmarkEnvironment env = context.getEnvironment(); diff --git a/src/main/java/jp/sourceforge/stigmata/command/LicenseCommand.java b/src/main/java/jp/sourceforge/stigmata/command/LicenseCommand.java index a1f6912..802794b 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/LicenseCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/LicenseCommand.java @@ -23,6 +23,7 @@ public class LicenseCommand extends AbstractStigmataCommand{ return "license"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ try{ InputStream in = getClass().getResourceAsStream("/META-INF/license.txt"); diff --git a/src/main/java/jp/sourceforge/stigmata/command/ListBirthmarksCommand.java b/src/main/java/jp/sourceforge/stigmata/command/ListBirthmarksCommand.java index e71a522..6959ec1 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/ListBirthmarksCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/ListBirthmarksCommand.java @@ -25,6 +25,7 @@ public class ListBirthmarksCommand extends AbstractStigmataCommand{ return "list-birthmarks"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ BirthmarkSpi[] spis = context.getEnvironment().findServices(); ResultPrinterSpi spi = stigmata.getPrinterManager().getService(context.getFormat()); diff --git a/src/main/java/jp/sourceforge/stigmata/command/UninstallCommand.java b/src/main/java/jp/sourceforge/stigmata/command/UninstallCommand.java index 2b6246e..d5fadf2 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/UninstallCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/UninstallCommand.java @@ -28,6 +28,7 @@ import jp.sourceforge.stigmata.utils.ConfigFileExporter; @Deprecated public class UninstallCommand extends AbstractStigmataCommand{ + @Override public boolean isAvailableArguments(String[] args){ return args.length > 0; } @@ -37,6 +38,7 @@ public class UninstallCommand extends AbstractStigmataCommand{ return "uninstall"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ File pluginsDir = new File(BirthmarkEnvironment.getStigmataHome(), "plugins"); BirthmarkEnvironment env = context.getEnvironment(); diff --git a/src/main/java/jp/sourceforge/stigmata/command/VersionCommand.java b/src/main/java/jp/sourceforge/stigmata/command/VersionCommand.java index 3a657e2..d57afe3 100644 --- a/src/main/java/jp/sourceforge/stigmata/command/VersionCommand.java +++ b/src/main/java/jp/sourceforge/stigmata/command/VersionCommand.java @@ -20,6 +20,7 @@ public class VersionCommand extends AbstractStigmataCommand{ return "version"; } + @Override public void perform(Stigmata stigmata, BirthmarkContext context, String[] args){ ResourceBundle helpResource = ResourceBundle.getBundle("resources.options"); Package p = getClass().getPackage(); diff --git a/src/main/java/jp/sourceforge/stigmata/event/BirthmarkEngineAdapter.java b/src/main/java/jp/sourceforge/stigmata/event/BirthmarkEngineAdapter.java index 529d04c..4a70837 100644 --- a/src/main/java/jp/sourceforge/stigmata/event/BirthmarkEngineAdapter.java +++ b/src/main/java/jp/sourceforge/stigmata/event/BirthmarkEngineAdapter.java @@ -10,15 +10,19 @@ package jp.sourceforge.stigmata.event; */ public class BirthmarkEngineAdapter implements BirthmarkEngineListener{ + @Override public void operationDone(BirthmarkEngineEvent e){ } + @Override public void operationStart(BirthmarkEngineEvent e){ } + @Override public void subOperationDone(BirthmarkEngineEvent e){ } + @Override public void subOperationStart(BirthmarkEngineEvent e){ } } diff --git a/src/main/java/jp/sourceforge/stigmata/filter/AbstractComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/AbstractComparisonPairFilter.java index 6c51297..4c3c2e8 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/AbstractComparisonPairFilter.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/AbstractComparisonPairFilter.java @@ -20,14 +20,17 @@ public abstract class AbstractComparisonPairFilter implements ComparisonPairFilt this.service = service; } + @Override public ComparisonPairFilterSpi getService(){ return service; } + @Override public Criterion getCriterion(){ return criterion; } + @Override public void setCriterion(Criterion criterion){ if(!isAcceptable(criterion)){ throw new IllegalArgumentException("illegal criterion: " @@ -36,6 +39,7 @@ public abstract class AbstractComparisonPairFilter implements ComparisonPairFilt this.criterion = criterion; } + @Override public boolean isAcceptable(Criterion criterion){ Criterion[] criteria = getAcceptableCriteria(); for(int i = 0; i < criteria.length; i++){ diff --git a/src/main/java/jp/sourceforge/stigmata/filter/AbstractComparisonPairFilterService.java b/src/main/java/jp/sourceforge/stigmata/filter/AbstractComparisonPairFilterService.java index ded3d7d..fc7797b 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/AbstractComparisonPairFilterService.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/AbstractComparisonPairFilterService.java @@ -16,16 +16,19 @@ import jp.sourceforge.stigmata.utils.LocalizedDescriptionManager; * @version $Revision$ */ abstract class AbstractComparisonPairFilterService extends AbstractServiceProvider implements ComparisonPairFilterSpi{ + @Override public String getDescription(Locale locale){ return LocalizedDescriptionManager.getInstance().getDescription( locale, getFilterName(), LocalizedDescriptionManager.ServiceCategory.filter ); } + @Override public String getDisplayFilterName(){ return getDisplayFilterName(Locale.getDefault()); } + @Override public String getDisplayFilterName(Locale locale){ return LocalizedDescriptionManager.getInstance().getDisplayType( locale, getFilterName(), LocalizedDescriptionManager.ServiceCategory.filter diff --git a/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java index a692ed9..b46a0bc 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java @@ -47,6 +47,7 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso return CRITERIA.toArray(new Criterion[CRITERIA.size()]); } + @Override public Criterion[] getAcceptableCriteria(){ return getValidCriteria(); } @@ -92,6 +93,7 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso return flag; } + @Override public boolean isFiltered(ComparisonPair pair){ if(target == FilterTarget.BOTH_TARGETS || target == FilterTarget.ONE_OF_TARGETS){ return isFilteredTwo(pair); @@ -153,6 +155,7 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso this.target = target; } + @Override public String toString(){ StringBuilder sb = new StringBuilder(); switch(getTarget()){ diff --git a/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilterService.java b/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilterService.java index abb9aa0..9f904b0 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilterService.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilterService.java @@ -13,14 +13,17 @@ import jp.sourceforge.stigmata.ComparisonPairFilter; */ public class BirthmarkElementCountComparisonPairFilterService extends AbstractComparisonPairFilterService{ + @Override public ComparisonPairFilter getFilter(){ return new BirthmarkElementCountComparisonPairFilter(this); } + @Override public String getFilterClassName(){ return BirthmarkElementCountComparisonPairFilter.class.getName(); } + @Override public String getFilterName(){ return "elementcount"; } diff --git a/src/main/java/jp/sourceforge/stigmata/filter/FilteredComparisonResultSet.java b/src/main/java/jp/sourceforge/stigmata/filter/FilteredComparisonResultSet.java index 5afaefa..9fce3fc 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/FilteredComparisonResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/FilteredComparisonResultSet.java @@ -54,6 +54,7 @@ public class FilteredComparisonResultSet implements ComparisonResultSet{ filters.remove(filter); } + @Override public ComparisonPair getPairAt(int index){ int currentIndex = 0; for(Iterator i = iterator(); i.hasNext(); ){ @@ -66,6 +67,7 @@ public class FilteredComparisonResultSet implements ComparisonResultSet{ return null; } + @Override public ComparisonPair[] getPairs(){ List list = new ArrayList(); for(Iterator i = iterator(); i.hasNext(); ){ @@ -74,22 +76,27 @@ public class FilteredComparisonResultSet implements ComparisonResultSet{ return list.toArray(new ComparisonPair[list.size()]); } + @Override public int getPairCount(){ return resultset.getPairCount(); } + @Override public BirthmarkContext getContext(){ return resultset.getContext(); } + @Override public BirthmarkEnvironment getEnvironment(){ return resultset.getEnvironment(); } + @Override public Iterator iterator(){ return new FilteredIterator(resultset.iterator()); } + @Override public synchronized BirthmarkSet[] getPairSources(){ List list = new ArrayList(); for(Iterator i = pairSources(); i.hasNext(); ){ @@ -98,6 +105,7 @@ public class FilteredComparisonResultSet implements ComparisonResultSet{ return list.toArray(new BirthmarkSet[list.size()]); } + @Override public Iterator pairSources(){ return resultset.pairSources(); } @@ -112,16 +120,19 @@ public class FilteredComparisonResultSet implements ComparisonResultSet{ next = findNext(); } + @Override public boolean hasNext(){ return next != null; } + @Override public ComparisonPair next(){ ComparisonPair returnValue = next; next = findNext(); return returnValue; } + @Override public void remove(){ throw new InternalError("not implemented"); } diff --git a/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilter.java index f187569..122c107 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilter.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilter.java @@ -35,6 +35,7 @@ public class SimilarityComparisonPairFilter extends AbstractComparisonPairFilter setThreshold(0.8d); } + @Override public boolean isFiltered(ComparisonPair pair){ double similarity = pair.calculateSimilarity(); boolean flag; @@ -68,6 +69,7 @@ public class SimilarityComparisonPairFilter extends AbstractComparisonPairFilter return CRITERIA.toArray(new Criterion[CRITERIA.size()]); } + @Override public Criterion[] getAcceptableCriteria(){ return getValidCriteria(); } @@ -83,6 +85,7 @@ public class SimilarityComparisonPairFilter extends AbstractComparisonPairFilter this.threshold = threshold; } + @Override public String toString(){ StringBuffer sb = new StringBuffer(); sb.append("similarity"); diff --git a/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilterService.java b/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilterService.java index 9e1f7e5..8fff8b4 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilterService.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilterService.java @@ -12,14 +12,17 @@ import jp.sourceforge.stigmata.ComparisonPairFilter; * @version $Revision$ */ public class SimilarityComparisonPairFilterService extends AbstractComparisonPairFilterService{ + @Override public ComparisonPairFilter getFilter(){ return new SimilarityComparisonPairFilter(this); } + @Override public String getFilterClassName(){ return SimilarityComparisonPairFilter.class.getName(); } + @Override public String getFilterName(){ return "similarity"; } diff --git a/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilter.java index e448d8b..db443fb 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilter.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilter.java @@ -35,6 +35,7 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter super(service); } + @Override public Criterion[] getAcceptableCriteria(){ return getValidCriteria(); } @@ -43,6 +44,7 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter return CRITERIA.toArray(new Criterion[CRITERIA.size()]); } + @Override public boolean isFiltered(ComparisonPair pair){ String v = value; if(v == null) v = ""; @@ -141,6 +143,7 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter return flag; } + @Override public String toString(){ if(getCriterion() == Criterion.MATCH || getCriterion() == Criterion.NOT_MATCH){ String value = " match "; diff --git a/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilterService.java b/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilterService.java index ccdf30c..8bb0503 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilterService.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilterService.java @@ -13,14 +13,17 @@ import jp.sourceforge.stigmata.ComparisonPairFilter; */ public class TargetNameComparisonPairFilterService extends AbstractComparisonPairFilterService{ + @Override public ComparisonPairFilter getFilter(){ return new TargetNameComparisonPairFilter(this); } + @Override public String getFilterClassName(){ return TargetNameComparisonPairFilter.class.getName(); } + @Override public String getFilterName(){ return "name"; } diff --git a/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilter.java index 951aaaa..b8157b9 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilter.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilter.java @@ -35,6 +35,7 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai super(service); } + @Override public Criterion[] getAcceptableCriteria(){ return getValidCriteria(); } @@ -43,6 +44,7 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai return CRITERIA.toArray(new Criterion[CRITERIA.size()]); } + @Override public boolean isFiltered(ComparisonPair pair){ boolean flag; if(getTarget() == FilterTarget.TARGET_1){ @@ -142,6 +144,7 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai this.target = target; } + @Override public String toString(){ StringBuilder sb = new StringBuilder(); switch(getTarget()){ diff --git a/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilterService.java b/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilterService.java index 9e91b06..1c33df4 100644 --- a/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilterService.java +++ b/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilterService.java @@ -13,14 +13,17 @@ import jp.sourceforge.stigmata.ComparisonPairFilter; */ public class TotalElementCountComparisonPairFilterService extends AbstractComparisonPairFilterService{ + @Override public ComparisonPairFilter getFilter(){ return new TotalElementCountComparisonPairFilter(this); } + @Override public String getFilterClassName(){ return TotalElementCountComparisonPairFilter.class.getName(); } + @Override public String getFilterName(){ return "totalelementcount"; } diff --git a/src/main/java/jp/sourceforge/stigmata/hook/AbstractStigmataHookService.java b/src/main/java/jp/sourceforge/stigmata/hook/AbstractStigmataHookService.java index 5e994d7..6f36d0b 100644 --- a/src/main/java/jp/sourceforge/stigmata/hook/AbstractStigmataHookService.java +++ b/src/main/java/jp/sourceforge/stigmata/hook/AbstractStigmataHookService.java @@ -13,34 +13,42 @@ import jp.sourceforge.stigmata.spi.StigmataHookSpi; * @version $Revision$ */ public abstract class AbstractStigmataHookService implements StigmataHookSpi{ + @Override public StigmataRuntimeHook afterComparison(){ return null; } + @Override public StigmataRuntimeHook afterExtraction(){ return null; } + @Override public StigmataRuntimeHook afterFiltering(){ return null; } + @Override public StigmataRuntimeHook beforeComparison(){ return null; } + @Override public StigmataRuntimeHook beforeExtraction(){ return null; } + @Override public StigmataRuntimeHook beforeFiltering(){ return null; } + @Override public StigmataHook onSetup(){ return null; } + @Override public StigmataHook onTearDown(){ return null; } diff --git a/src/main/java/jp/sourceforge/stigmata/hook/MultipleStigmataHook.java b/src/main/java/jp/sourceforge/stigmata/hook/MultipleStigmataHook.java index c3915e2..f299685 100644 --- a/src/main/java/jp/sourceforge/stigmata/hook/MultipleStigmataHook.java +++ b/src/main/java/jp/sourceforge/stigmata/hook/MultipleStigmataHook.java @@ -19,6 +19,7 @@ public class MultipleStigmataHook implements StigmataHook, StigmataRuntimeHook{ private List hooks = new ArrayList(); private List runtimeHooks = new ArrayList(); + @Override public void onHook(Phase phase, BirthmarkContext context){ for(StigmataRuntimeHook hook: runtimeHooks){ if(hook != null){ @@ -27,6 +28,7 @@ public class MultipleStigmataHook implements StigmataHook, StigmataRuntimeHook{ } } + @Override public void onHook(Phase phase, BirthmarkEnvironment env){ for(StigmataHook hook: hooks){ if(hook != null){ diff --git a/src/main/java/jp/sourceforge/stigmata/printer/AbstractBirthmarkServicePrinter.java b/src/main/java/jp/sourceforge/stigmata/printer/AbstractBirthmarkServicePrinter.java index a76d01c..d8f1113 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/AbstractBirthmarkServicePrinter.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/AbstractBirthmarkServicePrinter.java @@ -17,8 +17,10 @@ import jp.sourceforge.stigmata.spi.BirthmarkSpi; * @version $Revision$ */ public abstract class AbstractBirthmarkServicePrinter implements BirthmarkServicePrinter, Printer{ + @Override public abstract void printResult(PrintWriter out, BirthmarkSpi[] spilist); + @Override public String getResult(BirthmarkSpi[] spilist){ StringWriter writer = new StringWriter(); PrintWriter out = new PrintWriter(writer); @@ -29,9 +31,11 @@ public abstract class AbstractBirthmarkServicePrinter implements BirthmarkServic return writer.toString(); } + @Override public void printHeader(PrintWriter out){ } + @Override public void printFooter(PrintWriter out){ out.flush(); } diff --git a/src/main/java/jp/sourceforge/stigmata/printer/AbstractComparisonPairPrinter.java b/src/main/java/jp/sourceforge/stigmata/printer/AbstractComparisonPairPrinter.java index 97775e5..bd59dff 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/AbstractComparisonPairPrinter.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/AbstractComparisonPairPrinter.java @@ -16,15 +16,19 @@ import jp.sourceforge.stigmata.ComparisonPair; */ public abstract class AbstractComparisonPairPrinter implements ComparisonPairPrinter, Printer{ + @Override public abstract void printResult(PrintWriter out, ComparisonPair pair); + @Override public void printFooter(PrintWriter out){ out.flush(); } + @Override public void printHeader(PrintWriter out){ } + @Override public String getResult(ComparisonPair pair){ StringWriter writer = new StringWriter(); PrintWriter out = new PrintWriter(writer); diff --git a/src/main/java/jp/sourceforge/stigmata/printer/AbstractComparisonResultSetPrinter.java b/src/main/java/jp/sourceforge/stigmata/printer/AbstractComparisonResultSetPrinter.java index 1157774..8c3998c 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/AbstractComparisonResultSetPrinter.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/AbstractComparisonResultSetPrinter.java @@ -17,15 +17,19 @@ import jp.sourceforge.stigmata.ComparisonResultSet; * @version $Revision$ */ public abstract class AbstractComparisonResultSetPrinter implements ComparisonResultSetPrinter, Printer{ + @Override public abstract void printResult(PrintWriter out, ComparisonResultSet resultset); + @Override public void printHeader(PrintWriter out){ } + @Override public void printFooter(PrintWriter out){ out.flush(); } + @Override public String getResult(ComparisonResultSet resultset){ StringWriter writer = new StringWriter(); PrintWriter out = new PrintWriter(writer); diff --git a/src/main/java/jp/sourceforge/stigmata/printer/AbstractExtractionResultSetPrinter.java b/src/main/java/jp/sourceforge/stigmata/printer/AbstractExtractionResultSetPrinter.java index 720bdec..3a6b1ca 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/AbstractExtractionResultSetPrinter.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/AbstractExtractionResultSetPrinter.java @@ -17,6 +17,7 @@ import jp.sourceforge.stigmata.ExtractionResultSet; * @version $Revision$ */ public abstract class AbstractExtractionResultSetPrinter implements ExtractionResultSetPrinter{ + @Override public abstract void printResult(PrintWriter out, ExtractionResultSet ers); public void printHeader(PrintWriter out){ @@ -26,6 +27,7 @@ public abstract class AbstractExtractionResultSetPrinter implements ExtractionRe out.flush(); } + @Override public String getResult(ExtractionResultSet ers){ StringWriter writer = new StringWriter(); PrintWriter out = new PrintWriter(writer); diff --git a/src/main/java/jp/sourceforge/stigmata/printer/csv/BirthmarkServiceCsvPrinter.java b/src/main/java/jp/sourceforge/stigmata/printer/csv/BirthmarkServiceCsvPrinter.java index 9d62c30..2f44497 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/csv/BirthmarkServiceCsvPrinter.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/csv/BirthmarkServiceCsvPrinter.java @@ -17,6 +17,7 @@ import jp.sourceforge.stigmata.spi.BirthmarkSpi; * @version $Revision$ */ public class BirthmarkServiceCsvPrinter extends AbstractBirthmarkServicePrinter{ + @Override public void printResult(PrintWriter out, BirthmarkSpi[] spilist){ printHeader(out); for(BirthmarkSpi spi: spilist){ diff --git a/src/main/java/jp/sourceforge/stigmata/printer/csv/CsvResultPrinterService.java b/src/main/java/jp/sourceforge/stigmata/printer/csv/CsvResultPrinterService.java index 445477e..1bea6bc 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/csv/CsvResultPrinterService.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/csv/CsvResultPrinterService.java @@ -30,28 +30,34 @@ public class CsvResultPrinterService extends AbstractServiceProvider implements /** * returns a localized description of the birthmark this service provides. */ + @Override public String getDescription(Locale locale){ return LocalizedDescriptionManager.getInstance().getDescription( locale, getFormat(), LocalizedDescriptionManager.ServiceCategory.formatter ); } + @Override public String getFormat(){ return "csv"; } + @Override public ComparisonResultSetPrinter getComparisonResultSetPrinter() { return compare; } + @Override public ExtractionResultSetPrinter getExtractionResultSetPrinter() { return list; } + @Override public BirthmarkServicePrinter getBirthmarkServicePrinter() { return serviceList; } + @Override public ComparisonPairPrinter getComparisonPairPrinter(){ return pairPrinter; } diff --git a/src/main/java/jp/sourceforge/stigmata/printer/csv/ExtractionResultSetCsvPrinter.java b/src/main/java/jp/sourceforge/stigmata/printer/csv/ExtractionResultSetCsvPrinter.java index d894294..6178164 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/csv/ExtractionResultSetCsvPrinter.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/csv/ExtractionResultSetCsvPrinter.java @@ -22,6 +22,7 @@ import jp.sourceforge.stigmata.printer.AbstractExtractionResultSetPrinter; * @version $Revision$ */ public class ExtractionResultSetCsvPrinter extends AbstractExtractionResultSetPrinter{ + @Override public void printResult(PrintWriter out, ExtractionResultSet ers){ printHeader(out); for(Iterator i = ers.birthmarkSets(ExtractionTarget.TARGET_BOTH); i.hasNext(); ){ diff --git a/src/main/java/jp/sourceforge/stigmata/printer/xml/BirthmarkServiceXmlPrinter.java b/src/main/java/jp/sourceforge/stigmata/printer/xml/BirthmarkServiceXmlPrinter.java index 98aefa7..ce566c3 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/xml/BirthmarkServiceXmlPrinter.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/xml/BirthmarkServiceXmlPrinter.java @@ -17,6 +17,7 @@ import jp.sourceforge.stigmata.spi.BirthmarkSpi; * @version $Revision$ */ public class BirthmarkServiceXmlPrinter extends AbstractBirthmarkServicePrinter{ + @Override public void printResult(PrintWriter out, BirthmarkSpi[] spilist){ out.println(""); out.println(""); diff --git a/src/main/java/jp/sourceforge/stigmata/printer/xml/ExtractionResultSetXmlPrinter.java b/src/main/java/jp/sourceforge/stigmata/printer/xml/ExtractionResultSetXmlPrinter.java index a4bee22..ef0819c 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/xml/ExtractionResultSetXmlPrinter.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/xml/ExtractionResultSetXmlPrinter.java @@ -22,6 +22,7 @@ import jp.sourceforge.stigmata.printer.AbstractExtractionResultSetPrinter; * @version $Revision$ */ public class ExtractionResultSetXmlPrinter extends AbstractExtractionResultSetPrinter{ + @Override public void printResult(PrintWriter out, ExtractionResultSet ers){ printHeader(out); @@ -37,12 +38,14 @@ public class ExtractionResultSetXmlPrinter extends AbstractExtractionResultSetPr printFooter(out); } + @Override public void printHeader(PrintWriter out){ out.println(""); out.println(""); out.println(" "); } + @Override public void printFooter(PrintWriter out){ out.println(" "); out.println(""); diff --git a/src/main/java/jp/sourceforge/stigmata/printer/xml/XmlResultPrinterService.java b/src/main/java/jp/sourceforge/stigmata/printer/xml/XmlResultPrinterService.java index e9829ae..39692cc 100644 --- a/src/main/java/jp/sourceforge/stigmata/printer/xml/XmlResultPrinterService.java +++ b/src/main/java/jp/sourceforge/stigmata/printer/xml/XmlResultPrinterService.java @@ -30,28 +30,34 @@ public class XmlResultPrinterService extends AbstractServiceProvider implements /** * returns a localized description of the birthmark this service provides. */ + @Override public String getDescription(Locale locale){ return LocalizedDescriptionManager.getInstance().getDescription( locale, getFormat(), LocalizedDescriptionManager.ServiceCategory.formatter ); } + @Override public String getFormat(){ return "xml"; } + @Override public ComparisonResultSetPrinter getComparisonResultSetPrinter() { return compare; } + @Override public ExtractionResultSetPrinter getExtractionResultSetPrinter() { return list; } + @Override public BirthmarkServicePrinter getBirthmarkServicePrinter() { return serviceList; } + @Override public ComparisonPairPrinter getComparisonPairPrinter(){ return pairPrinter; } diff --git a/src/main/java/jp/sourceforge/stigmata/resolvers/DefaultStigmataHomeResolver.java b/src/main/java/jp/sourceforge/stigmata/resolvers/DefaultStigmataHomeResolver.java index d32ee1b..37bf02f 100644 --- a/src/main/java/jp/sourceforge/stigmata/resolvers/DefaultStigmataHomeResolver.java +++ b/src/main/java/jp/sourceforge/stigmata/resolvers/DefaultStigmataHomeResolver.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.IOException; class DefaultStigmataHomeResolver implements StigmataHomeResolver{ + @Override public String getStigmataHome() throws IOException{ return getUserHome() + File.separator + ".stigmata"; } @@ -19,6 +20,7 @@ class DefaultStigmataHomeResolver implements StigmataHomeResolver{ return userHome; } + @Override public boolean isTarget(String osName){ return true; } diff --git a/src/main/java/jp/sourceforge/stigmata/resolvers/PropertyStigmataHomeResolver.java b/src/main/java/jp/sourceforge/stigmata/resolvers/PropertyStigmataHomeResolver.java index 4b25899..cf53d42 100644 --- a/src/main/java/jp/sourceforge/stigmata/resolvers/PropertyStigmataHomeResolver.java +++ b/src/main/java/jp/sourceforge/stigmata/resolvers/PropertyStigmataHomeResolver.java @@ -3,6 +3,7 @@ package jp.sourceforge.stigmata.resolvers; import java.io.IOException; class PropertyStigmataHomeResolver implements StigmataHomeResolver{ + @Override public String getStigmataHome() throws IOException{ String stigmataHome = System.getProperty("stigmata.home"); if(stigmataHome == null){ @@ -11,6 +12,7 @@ class PropertyStigmataHomeResolver implements StigmataHomeResolver{ return stigmataHome; } + @Override public boolean isTarget(String osName){ return true; } diff --git a/src/main/java/jp/sourceforge/stigmata/result/AbstractComparisonResultSet.java b/src/main/java/jp/sourceforge/stigmata/result/AbstractComparisonResultSet.java index a17d709..547b5ab 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/AbstractComparisonResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/result/AbstractComparisonResultSet.java @@ -30,14 +30,18 @@ public abstract class AbstractComparisonResultSet implements ComparisonResultSet this.extraction = extraction; } + @Override public abstract Iterator iterator(); + @Override public abstract Iterator pairSources(); + @Override public synchronized BirthmarkSet[] getPairSources(){ return AbstractComparisonResultSet.getArrays(pairSources(), new BirthmarkSet[0]); } + @Override public int getPairCount(){ if(count < 0){ int calculateCount = 0; @@ -50,10 +54,12 @@ public abstract class AbstractComparisonResultSet implements ComparisonResultSet return count; } + @Override public synchronized ComparisonPair[] getPairs(){ return AbstractComparisonResultSet.getArrays(iterator(), new ComparisonPair[0]); } + @Override public ComparisonPair getPairAt(int index){ int currentIndex = 0; for(Iterator i = iterator(); i.hasNext(); ){ @@ -66,10 +72,12 @@ public abstract class AbstractComparisonResultSet implements ComparisonResultSet return null; } + @Override public BirthmarkContext getContext(){ return extraction.getContext(); } + @Override public BirthmarkEnvironment getEnvironment(){ return extraction.getEnvironment(); } diff --git a/src/main/java/jp/sourceforge/stigmata/result/AbstractExtractionResultSet.java b/src/main/java/jp/sourceforge/stigmata/result/AbstractExtractionResultSet.java index 38e2042..ece503b 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/AbstractExtractionResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/result/AbstractExtractionResultSet.java @@ -46,6 +46,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet this.id = id; } + @Override public String getId(){ return id; } @@ -53,6 +54,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet /** * returns a birthmark environment. */ + @Override public BirthmarkEnvironment getEnvironment(){ return context.getEnvironment(); } @@ -60,24 +62,31 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet /** * returns a birthmark context. */ + @Override public BirthmarkContext getContext(){ return context; } + @Override public abstract void addBirthmarkSet(ExtractionTarget target, BirthmarkSet set) throws BirthmarkStoreException; + @Override public abstract void removeBirthmarkSet(ExtractionTarget target, BirthmarkSet set); + @Override public abstract void removeAllBirthmarkSets(ExtractionTarget target); + @Override public abstract int getBirthmarkSetSize(ExtractionTarget target); + @Override public abstract Iterator birthmarkSets(ExtractionTarget target); /** * returns the sum of birthmark set size this instance has. * getBirthmarkSetSize(ExtractionTarget.TARGET_BOTH) */ + @Override public int getBirthmarkSetSize(){ return getBirthmarkSetSize(ExtractionTarget.TARGET_BOTH); } @@ -86,6 +95,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet * returns an iterator. * birthmarkSets(ExtractionTarget.TARGET_BOTH) */ + @Override public Iterator iterator(){ return birthmarkSets(ExtractionTarget.TARGET_BOTH); } @@ -94,6 +104,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet * returns a birthmark set related of given index. * getBirthmarkSet(ExtractionTarget.TARGET_BOTH, index) */ + @Override public BirthmarkSet getBirthmarkSet(int index){ return getBirthmarkSet(ExtractionTarget.TARGET_BOTH, index); } @@ -102,6 +113,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet * returns a birthmark set related with given name. * getBirthmarkSet(ExtractionTarget.TARGET_BOTH, name) */ + @Override public BirthmarkSet getBirthmarkSet(String name){ return getBirthmarkSet(ExtractionTarget.TARGET_BOTH, name); } @@ -110,6 +122,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet * returns all of birthmark sets. * getBirthmarkSets(ExtractionTarget.TARGET_BOTH) */ + @Override public BirthmarkSet[] getBirthmarkSets(){ return getBirthmarkSets(ExtractionTarget.TARGET_BOTH); } @@ -118,6 +131,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet * remove specified birthmark set from this instance. * removeBirthmarkSet(ExtractionTarget.TARGET_BOTH, bs) */ + @Override public void removeBirthmarkSet(BirthmarkSet bs){ removeBirthmarkSet(ExtractionTarget.TARGET_BOTH, bs); } @@ -126,6 +140,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet * remove all of birthmark sets. * removeBirthmarkSet(ExtractionTarget.TARGET_BOTH) */ + @Override public void removeAllBirthmarkSets(){ removeAllBirthmarkSets(ExtractionTarget.TARGET_BOTH); } @@ -133,6 +148,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet /** * returns an array of extracted birthmark types. */ + @Override public String[] getBirthmarkTypes(){ return context.getBirthmarkTypes(); } @@ -140,6 +156,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet /** * returns an unit of extraction from. */ + @Override public ExtractionUnit getExtractionUnit(){ return context.getExtractionUnit(); } @@ -147,6 +164,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet /** * returns the birthmark set at the specified position in the specified target. */ + @Override public BirthmarkSet getBirthmarkSet(ExtractionTarget target, int index){ int currentIndex = 0; for(Iterator i = birthmarkSets(target); i.hasNext(); ){ @@ -162,6 +180,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet /** * returns the birthmark set related with the specified name in the specified target. */ + @Override public BirthmarkSet getBirthmarkSet(ExtractionTarget target, String setname){ for(Iterator i = birthmarkSets(target); i.hasNext(); ){ BirthmarkSet bs = i.next(); @@ -175,10 +194,12 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet /** * @return all of BirthmarkSet this instance have. elements is obtained from birthmarkSet. */ + @Override public synchronized BirthmarkSet[] getBirthmarkSets(ExtractionTarget target){ return AbstractComparisonResultSet.getArrays(birthmarkSets(target), new BirthmarkSet[0]); } + @Override public void setBirthmarkSets(ExtractionTarget target, BirthmarkSet[] sets) throws BirthmarkStoreException{ removeAllBirthmarkSets(target); for(int i = 0; i < sets.length; i++){ @@ -186,10 +207,12 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet } } + @Override public boolean isTableType(){ return tableType; } + @Override public void setTableType(boolean flag){ this.tableType = flag; } diff --git a/src/main/java/jp/sourceforge/stigmata/result/CertainPairComparisonResultSet.java b/src/main/java/jp/sourceforge/stigmata/result/CertainPairComparisonResultSet.java index dd22b24..d453cb1 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/CertainPairComparisonResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/result/CertainPairComparisonResultSet.java @@ -112,6 +112,7 @@ public class CertainPairComparisonResultSet extends AbstractComparisonResultSet{ return sources.iterator(); } + @Override public BirthmarkSet[] getPairSources(){ if(sources == null){ sources = createSources(); @@ -174,16 +175,19 @@ public class CertainPairComparisonResultSet extends AbstractComparisonResultSet{ next = findNext(); } + @Override public boolean hasNext(){ return next != null; } + @Override public ComparisonPair next(){ ComparisonPair returnValue = next; next = findNext(); return returnValue; } + @Override public void remove(){ } @@ -227,16 +231,19 @@ public class CertainPairComparisonResultSet extends AbstractComparisonResultSet{ nextPair = findNextPair(); } + @Override public ComparisonPair next(){ ComparisonPair cp = nextPair; nextPair = findNextPair(); return cp; } + @Override public boolean hasNext(){ return nextPair != null; } + @Override public void remove(){ } diff --git a/src/main/java/jp/sourceforge/stigmata/result/MemoryExtractedBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/result/MemoryExtractedBirthmarkService.java index 7dc383e..57d1684 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/MemoryExtractedBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/result/MemoryExtractedBirthmarkService.java @@ -19,20 +19,24 @@ import jp.sourceforge.stigmata.spi.ExtractedBirthmarkSpi; public class MemoryExtractedBirthmarkService implements ExtractedBirthmarkSpi{ private MemoryExtractedBirthmarkHistory history = new MemoryExtractedBirthmarkHistory(); + @Override public ExtractionResultSet createResultSet(BirthmarkContext context){ MemoryExtractionResultSet mers = new MemoryExtractionResultSet(context); history.addResultSet(mers); return mers; } + @Override public ExtractedBirthmarkHistory getHistory(String parameter){ return history; } + @Override public ExtractionResultSet getResultSet(String id){ return history.getResultSet(id); } + @Override public BirthmarkStoreTarget getTarget(){ return BirthmarkStoreTarget.MEMORY; } diff --git a/src/main/java/jp/sourceforge/stigmata/result/MemoryExtractionResultSet.java b/src/main/java/jp/sourceforge/stigmata/result/MemoryExtractionResultSet.java index 2f29fcb..7c5a96b 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/MemoryExtractionResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/result/MemoryExtractionResultSet.java @@ -31,10 +31,12 @@ public class MemoryExtractionResultSet extends AbstractExtractionResultSet{ super(context, tableType); } + @Override public BirthmarkStoreTarget getStoreTarget(){ return BirthmarkStoreTarget.MEMORY; } + @Override public void removeAllBirthmarkSets(ExtractionTarget target){ switch(target){ case TARGET_X: @@ -50,6 +52,7 @@ public class MemoryExtractionResultSet extends AbstractExtractionResultSet{ } } + @Override public void removeBirthmarkSet(ExtractionTarget target, BirthmarkSet set){ switch(target){ case TARGET_X: @@ -65,6 +68,7 @@ public class MemoryExtractionResultSet extends AbstractExtractionResultSet{ } } + @Override public void addBirthmarkSet(ExtractionTarget target, BirthmarkSet set){ switch(target){ case TARGET_X: @@ -80,6 +84,7 @@ public class MemoryExtractionResultSet extends AbstractExtractionResultSet{ } } + @Override public Iterator birthmarkSets(ExtractionTarget target){ Iterator iterator; switch(target){ @@ -100,6 +105,7 @@ public class MemoryExtractionResultSet extends AbstractExtractionResultSet{ } return iterator; } + @Override public int getBirthmarkSetSize(ExtractionTarget target){ int count = 0; switch(target){ @@ -118,6 +124,7 @@ public class MemoryExtractionResultSet extends AbstractExtractionResultSet{ return count; } + @Override public BirthmarkSet getBirthmarkSet(ExtractionTarget target, int index){ BirthmarkSet set; switch(target){ @@ -141,6 +148,7 @@ public class MemoryExtractionResultSet extends AbstractExtractionResultSet{ return set; } + @Override public BirthmarkSet[] getBirthmarkSets(ExtractionTarget target){ BirthmarkSet[] sets; switch(target){ diff --git a/src/main/java/jp/sourceforge/stigmata/result/RDBExtractedBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/result/RDBExtractedBirthmarkService.java index 0a8a605..abfbaa3 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/RDBExtractedBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/result/RDBExtractedBirthmarkService.java @@ -24,18 +24,22 @@ public class RDBExtractedBirthmarkService implements ExtractedBirthmarkSpi{ public RDBExtractedBirthmarkService(){ } + @Override public ExtractionResultSet createResultSet(BirthmarkContext context){ return new RDBExtractionResultSet(context); } + @Override public ExtractedBirthmarkHistory getHistory(String parameter){ return new RDBExtractedBirthmarkHistory(source); } + @Override public ExtractionResultSet getResultSet(String id){ return new RDBExtractionResultSet(source, id); } + @Override public BirthmarkStoreTarget getTarget(){ return BirthmarkStoreTarget.RDB; } diff --git a/src/main/java/jp/sourceforge/stigmata/result/RDBExtractionResultSet.java b/src/main/java/jp/sourceforge/stigmata/result/RDBExtractionResultSet.java index 6289937..eeecc2d 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/RDBExtractionResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/result/RDBExtractionResultSet.java @@ -141,6 +141,7 @@ public class RDBExtractionResultSet extends AbstractExtractionResultSet{ } } + @Override public BirthmarkStoreTarget getStoreTarget(){ return BirthmarkStoreTarget.RDB; } @@ -185,6 +186,7 @@ public class RDBExtractionResultSet extends AbstractExtractionResultSet{ this.index = index; } + @Override public Object handle(ResultSet rs) throws SQLException{ List list = new ArrayList(); while(rs.next()){ @@ -201,6 +203,7 @@ public class RDBExtractionResultSet extends AbstractExtractionResultSet{ this.env = env; } + @Override public Object handle(ResultSet rs) throws SQLException{ Map map = new HashMap(); diff --git a/src/main/java/jp/sourceforge/stigmata/result/RoundRobinComparisonResultSet.java b/src/main/java/jp/sourceforge/stigmata/result/RoundRobinComparisonResultSet.java index 38aa9a2..dba9948 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/RoundRobinComparisonResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/result/RoundRobinComparisonResultSet.java @@ -54,10 +54,12 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ /** * @return environment */ + @Override public BirthmarkEnvironment getEnvironment(){ return extraction.getEnvironment(); } + @Override public BirthmarkContext getContext(){ return extraction.getContext(); } @@ -93,6 +95,7 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ /** * returns the compare count of birthmark sets. */ + @Override public int getPairCount(){ return compareCount; } @@ -100,6 +103,7 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ /** * return a iterator of whole comparison. */ + @Override public Iterator iterator(){ if(tableType){ return new CompareTableIterator(); @@ -109,6 +113,7 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ } } + @Override public BirthmarkSet[] getPairSources(){ List list = new ArrayList(); for(Iterator i = pairSources(); i.hasNext(); ){ @@ -118,6 +123,7 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ return list.toArray(new BirthmarkSet[list.size()]); } + @Override public Iterator pairSources(){ Map map = new HashMap(); if(extraction.isTableType()){ @@ -144,10 +150,12 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ private Iterator iy = extraction.birthmarkSets(ExtractionTarget.TARGET_Y); private BirthmarkSet x = ix.next(); + @Override public boolean hasNext(){ return ix.hasNext() || iy.hasNext(); } + @Override public ComparisonPair next(){ if(!iy.hasNext()){ iy = extraction.birthmarkSets(ExtractionTarget.TARGET_Y); @@ -158,6 +166,7 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ return new ComparisonPair(x, y, extraction.getContext()); } + @Override public void remove(){ } } @@ -176,10 +185,12 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ iterator = extraction.birthmarkSets(ExtractionTarget.TARGET_XY); next = findNext(); } + @Override public boolean hasNext(){ return next != null; } + @Override public ComparisonPair next(){ ComparisonPair returnValue = next; next = findNext(); @@ -216,6 +227,7 @@ public class RoundRobinComparisonResultSet extends AbstractComparisonResultSet{ return pair; } + @Override public void remove(){ } } diff --git a/src/main/java/jp/sourceforge/stigmata/result/SingleExtractionResultSet.java b/src/main/java/jp/sourceforge/stigmata/result/SingleExtractionResultSet.java index 869df9f..f45569a 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/SingleExtractionResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/result/SingleExtractionResultSet.java @@ -30,18 +30,22 @@ public class SingleExtractionResultSet extends AbstractExtractionResultSet{ super(context, false); } + @Override public BirthmarkStoreTarget getStoreTarget(){ return BirthmarkStoreTarget.MEMORY_SINGLE; } + @Override public void addBirthmarkSet(ExtractionTarget target, BirthmarkSet set){ this.bs = set; } + @Override public void setBirthmarkSets(ExtractionTarget target, BirthmarkSet[] sets){ this.bs = sets[0]; } + @Override public Iterator birthmarkSets(ExtractionTarget target){ if(bs != null){ return new SingleIterator(bs); @@ -49,14 +53,17 @@ public class SingleExtractionResultSet extends AbstractExtractionResultSet{ return new NullIterator(); } + @Override public void removeBirthmarkSet(ExtractionTarget target, BirthmarkSet set){ bs = null; } + @Override public void removeAllBirthmarkSets(ExtractionTarget target){ bs = null; } + @Override public BirthmarkSet getBirthmarkSet(ExtractionTarget target, int index){ if(index != 0){ throw new IndexOutOfBoundsException("illegal index: " + index); @@ -64,6 +71,7 @@ public class SingleExtractionResultSet extends AbstractExtractionResultSet{ return bs; } + @Override public BirthmarkSet getBirthmarkSet(ExtractionTarget target, String name){ if(bs.getName().equals(name)){ return bs; @@ -71,6 +79,7 @@ public class SingleExtractionResultSet extends AbstractExtractionResultSet{ return null; } + @Override public int getBirthmarkSetSize(ExtractionTarget target){ return 1; } @@ -83,6 +92,7 @@ public class SingleExtractionResultSet extends AbstractExtractionResultSet{ this.bs = bs; } + @Override public BirthmarkSet next(){ if(first){ first = false; @@ -91,10 +101,12 @@ public class SingleExtractionResultSet extends AbstractExtractionResultSet{ throw new NoSuchElementException(); } + @Override public boolean hasNext(){ return first; } + @Override public void remove(){ } } diff --git a/src/main/java/jp/sourceforge/stigmata/result/XmlFileExtractedBirthmarkService.java b/src/main/java/jp/sourceforge/stigmata/result/XmlFileExtractedBirthmarkService.java index 8887d00..cd7adff 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/XmlFileExtractedBirthmarkService.java +++ b/src/main/java/jp/sourceforge/stigmata/result/XmlFileExtractedBirthmarkService.java @@ -29,6 +29,7 @@ public class XmlFileExtractedBirthmarkService implements ExtractedBirthmarkSpi{ ); } + @Override public ExtractionResultSet createResultSet(BirthmarkContext context){ return createResultSet(context, defaultBaseDirectory); } @@ -39,6 +40,7 @@ public class XmlFileExtractedBirthmarkService implements ExtractedBirthmarkSpi{ ); } + @Override public ExtractedBirthmarkHistory getHistory(String parameter){ File file = defaultBaseDirectory; if(parameter != null){ @@ -50,10 +52,12 @@ public class XmlFileExtractedBirthmarkService implements ExtractedBirthmarkSpi{ return new XmlFileExtractedBirthmarkHistory(file); } + @Override public ExtractionResultSet getResultSet(String id){ return new XmlFileExtractionResultSet(new File(id)); } + @Override public BirthmarkStoreTarget getTarget(){ return BirthmarkStoreTarget.XMLFILE; } diff --git a/src/main/java/jp/sourceforge/stigmata/result/XmlFileExtractionResultSet.java b/src/main/java/jp/sourceforge/stigmata/result/XmlFileExtractionResultSet.java index 12ad840..5ceb342 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/XmlFileExtractionResultSet.java +++ b/src/main/java/jp/sourceforge/stigmata/result/XmlFileExtractionResultSet.java @@ -165,6 +165,7 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{ return size; } + @Override public BirthmarkStoreTarget getStoreTarget(){ return BirthmarkStoreTarget.XMLFILE; } @@ -243,6 +244,7 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{ } } + @Override public boolean hasNext(){ boolean flag = nextObject != null; if(!flag){ @@ -255,6 +257,7 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{ return flag; } + @Override public BirthmarkSet next(){ BirthmarkSet next = nextObject; try{ @@ -265,6 +268,7 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{ return next; } + @Override public void remove(){ } diff --git a/src/main/java/jp/sourceforge/stigmata/result/history/ExtractedBirthmarkHistory.java b/src/main/java/jp/sourceforge/stigmata/result/history/ExtractedBirthmarkHistory.java index a3291f1..29a953d 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/history/ExtractedBirthmarkHistory.java +++ b/src/main/java/jp/sourceforge/stigmata/result/history/ExtractedBirthmarkHistory.java @@ -18,6 +18,7 @@ public interface ExtractedBirthmarkHistory extends Iterable{ /** * returns a list of histor ids as iterator. */ + @Override public Iterator iterator(); /** diff --git a/src/main/java/jp/sourceforge/stigmata/result/history/MemoryExtractedBirthmarkHistory.java b/src/main/java/jp/sourceforge/stigmata/result/history/MemoryExtractedBirthmarkHistory.java index b434b0d..bb5da11 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/history/MemoryExtractedBirthmarkHistory.java +++ b/src/main/java/jp/sourceforge/stigmata/result/history/MemoryExtractedBirthmarkHistory.java @@ -24,26 +24,32 @@ public class MemoryExtractedBirthmarkHistory implements ExtractedBirthmarkHistor map.put(mers.getId(), mers); } + @Override public void deleteResultSet(String id){ map.remove(id); } + @Override public void deleteAllResultSets(){ map.clear(); } + @Override public ExtractionResultSet getResultSet(String id){ return map.get(id); } + @Override public synchronized String[] getResultSetIds(){ return map.keySet().toArray(new String[map.size()]); } + @Override public Iterator iterator(){ return Collections.unmodifiableSet(map.keySet()).iterator(); } + @Override public void refresh(){ } } diff --git a/src/main/java/jp/sourceforge/stigmata/result/history/RDBExtractedBirthmarkHistory.java b/src/main/java/jp/sourceforge/stigmata/result/history/RDBExtractedBirthmarkHistory.java index 0cfc7df..b6e4f8c 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/history/RDBExtractedBirthmarkHistory.java +++ b/src/main/java/jp/sourceforge/stigmata/result/history/RDBExtractedBirthmarkHistory.java @@ -28,6 +28,7 @@ public class RDBExtractedBirthmarkHistory implements ExtractedBirthmarkHistory{ this.source = source; } + @Override public void deleteResultSet(String id){ QueryRunner runner = new QueryRunner(source); @@ -39,6 +40,7 @@ public class RDBExtractedBirthmarkHistory implements ExtractedBirthmarkHistory{ } } + @Override public void deleteAllResultSets(){ QueryRunner runner = new QueryRunner(source); try{ @@ -49,10 +51,12 @@ public class RDBExtractedBirthmarkHistory implements ExtractedBirthmarkHistory{ } } + @Override public ExtractionResultSet getResultSet(String id){ return new RDBExtractionResultSet(source, id); } + @Override public String[] getResultSetIds(){ QueryRunner runner = new QueryRunner(source); try{ @@ -65,10 +69,12 @@ public class RDBExtractedBirthmarkHistory implements ExtractedBirthmarkHistory{ return new String[0]; } + @Override public Iterator iterator(){ return new ArrayIterator(getResultSetIds()); } + @Override public void refresh(){ // do nothing. } diff --git a/src/main/java/jp/sourceforge/stigmata/result/history/XmlFileExtractedBirthmarkHistory.java b/src/main/java/jp/sourceforge/stigmata/result/history/XmlFileExtractedBirthmarkHistory.java index ad7744c..8d22b30 100644 --- a/src/main/java/jp/sourceforge/stigmata/result/history/XmlFileExtractedBirthmarkHistory.java +++ b/src/main/java/jp/sourceforge/stigmata/result/history/XmlFileExtractedBirthmarkHistory.java @@ -37,6 +37,7 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto refresh(); } + @Override public void refresh(){ files.clear(); @@ -49,6 +50,7 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto } } + @Override public void deleteAllResultSets(){ for(File file: parent.listFiles()){ if(isTarget(file)){ @@ -57,6 +59,7 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto } } + @Override public void deleteResultSet(String id){ File file = files.get(id); if(file != null){ @@ -69,6 +72,7 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto } } + @Override public ExtractionResultSet getResultSet(String id){ File file = files.get(id); if(file != null){ @@ -77,10 +81,12 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto return null; } + @Override public synchronized String[] getResultSetIds(){ return files.keySet().toArray(new String[files.size()]); } + @Override public Iterator iterator(){ return files.keySet().iterator(); } diff --git a/src/main/java/jp/sourceforge/stigmata/spi/AbstractServiceProvider.java b/src/main/java/jp/sourceforge/stigmata/spi/AbstractServiceProvider.java index d2a0744..bac2f09 100644 --- a/src/main/java/jp/sourceforge/stigmata/spi/AbstractServiceProvider.java +++ b/src/main/java/jp/sourceforge/stigmata/spi/AbstractServiceProvider.java @@ -17,6 +17,7 @@ public abstract class AbstractServiceProvider implements ServiceProvider{ /** * returning implementation vendor name of this SPI. */ + @Override public String getDescription(){ return getDescription(Locale.getDefault()); } @@ -24,6 +25,7 @@ public abstract class AbstractServiceProvider implements ServiceProvider{ /** * returning implementation vendor name of this SPI. */ + @Override public String getVendorName(){ return getClass().getPackage().getImplementationVendor(); } @@ -31,6 +33,7 @@ public abstract class AbstractServiceProvider implements ServiceProvider{ /** * returning version of this SPI. */ + @Override public String getVersion(){ return getClass().getPackage().getImplementationVersion(); } diff --git a/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkComparatorSpi.java b/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkComparatorSpi.java index 40d69d1..568ca75 100644 --- a/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkComparatorSpi.java +++ b/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkComparatorSpi.java @@ -23,11 +23,13 @@ public interface BirthmarkComparatorSpi extends ServiceProvider{ /** * returns a localized description of the birthmark this service provides. */ + @Override public String getDescription(Locale locale); /** * returns a localized description of the birthmark in default locale. */ + @Override public String getDescription(); public String getComparatorClassName(); diff --git a/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkExtractorSpi.java b/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkExtractorSpi.java index e0ca308..a893fa2 100644 --- a/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkExtractorSpi.java +++ b/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkExtractorSpi.java @@ -23,11 +23,13 @@ public interface BirthmarkExtractorSpi extends ServiceProvider{ /** * returns a localized description of the birthmark this service provides. */ + @Override public String getDescription(Locale locale); /** * returns a localized description of the birthmark in default locale. */ + @Override public String getDescription(); public String getExtractorClassName(); diff --git a/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkSpi.java b/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkSpi.java index 9af5fe4..1652b4d 100644 --- a/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkSpi.java +++ b/src/main/java/jp/sourceforge/stigmata/spi/BirthmarkSpi.java @@ -42,11 +42,13 @@ public interface BirthmarkSpi extends ServiceProvider{ /** * returns a localized description of the birthmark this service provides. */ + @Override public String getDescription(Locale locale); /** * returns a localized description of the birthmark in default locale. */ + @Override public String getDescription(); public String getExtractorClassName(); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkDefinitionPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkDefinitionPane.java index d76b15a..7df6c64 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkDefinitionPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkDefinitionPane.java @@ -127,18 +127,21 @@ public class BirthmarkDefinitionPane extends JPanel{ removeService.setEnabled(false); serviceList.addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent e){ listValueChanged(e); } }); newService.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ addNewService(); } }); removeService.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ removeService(); } @@ -239,6 +242,7 @@ public class BirthmarkDefinitionPane extends JPanel{ return type.getText(); } + @Override public void setEnabled(boolean flag){ super.setEnabled(flag); @@ -393,14 +397,17 @@ public class BirthmarkDefinitionPane extends JPanel{ comparator.setEditable(true); DocumentListener listener = new DocumentListener(){ + @Override public void insertUpdate(DocumentEvent e){ thisPane.updateView(); } + @Override public void removeUpdate(DocumentEvent e){ thisPane.updateView(); } + @Override public void changedUpdate(DocumentEvent e){ thisPane.updateView(); } @@ -410,6 +417,7 @@ public class BirthmarkDefinitionPane extends JPanel{ displayType.getDocument().addDocumentListener(listener); description.getDocument().addDocumentListener(listener); ItemListener itemListener = new ItemListener(){ + @Override public void itemStateChanged(ItemEvent e){ thisPane.updateView(); } @@ -417,6 +425,7 @@ public class BirthmarkDefinitionPane extends JPanel{ comparator.addItemListener(itemListener); extractor.addItemListener(itemListener); ActionListener actionListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ thisPane.updateView(); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkExtractionResultPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkExtractionResultPane.java index 8c011b4..451b27c 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkExtractionResultPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkExtractionResultPane.java @@ -47,6 +47,7 @@ public class BirthmarkExtractionResultPane extends JPanel{ private void initLayouts(){ JComponent southPanel = Box.createHorizontalBox(); Action saveAction = new SaveAction(frame, new AsciiDataWritable(){ + @Override public void writeAsciiData(PrintWriter out, String format){ ResultPrinterSpi service = PrinterManager.getInstance().getService(format); if(service == null){ @@ -60,6 +61,7 @@ public class BirthmarkExtractionResultPane extends JPanel{ Action compareAction = new AbstractAction(){ private static final long serialVersionUID = -1938101718384412339L; + @Override public void actionPerformed(ActionEvent e){ frame.compareExtractionResult(extraction); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectablePane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectablePane.java index c21dc1c..d0c0566 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectablePane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectablePane.java @@ -107,6 +107,7 @@ public abstract class BirthmarkSelectablePane extends JPanel implements Birthmar listeners.add(listener); } + @Override public void serviceAdded(BirthmarkSpi service){ if(services.get(service.getType()) == null){ BirthmarkSelection elem = new BirthmarkSelection(service); @@ -117,6 +118,7 @@ public abstract class BirthmarkSelectablePane extends JPanel implements Birthmar fireEvent(); } + @Override public void serviceRemoved(BirthmarkSpi service){ BirthmarkSelection elem = services.get(service); if(elem != null){ diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionCheckSetPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionCheckSetPane.java index 5f29432..e807e83 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionCheckSetPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionCheckSetPane.java @@ -48,6 +48,7 @@ public class BirthmarkSelectionCheckSetPane extends BirthmarkSelectablePane{ add(box, BorderLayout.SOUTH); ActionListener listener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ boolean flag = e.getActionCommand().equals("checkall"); for(Iterator i = birthmarkSelections(); i.hasNext(); ){ @@ -65,6 +66,7 @@ public class BirthmarkSelectionCheckSetPane extends BirthmarkSelectablePane{ /** * update layouts and update selected birthmarks list. */ + @Override protected void updateLayouts(){ checks.removeAll(); Dimension d = calculateDimension(); @@ -76,6 +78,7 @@ public class BirthmarkSelectionCheckSetPane extends BirthmarkSelectablePane{ JCheckBox check = new JCheckBox(elem.getService().getDisplayType()); check.setSelected(elem.isSelected()); check.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ JCheckBox c = (JCheckBox)e.getSource(); elem.setSelected(c.isSelected()); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionListPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionListPane.java index d2f1cd2..da28e3b 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionListPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionListPane.java @@ -42,6 +42,7 @@ public class BirthmarkSelectionListPane extends BirthmarkSelectablePane{ initLayouts(); } + @Override public void serviceRemoved(BirthmarkSpi service){ BirthmarkSelection elem = getSelection(service.getType()); model.removeElement(elem); @@ -68,6 +69,7 @@ public class BirthmarkSelectionListPane extends BirthmarkSelectablePane{ add(box, BorderLayout.SOUTH); ActionListener listener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ boolean flag = e.getActionCommand().equals("checkall"); for(Iterator i = birthmarkSelections(); i.hasNext(); ){ @@ -95,6 +97,7 @@ public class BirthmarkSelectionListPane extends BirthmarkSelectablePane{ /** * update layouts and update selected birthmarks list. */ + @Override protected void updateLayouts(){ model.removeAllElements(); @@ -117,6 +120,7 @@ public class BirthmarkSelectionListPane extends BirthmarkSelectablePane{ setOpaque(true); } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean forcus){ BirthmarkSelection elem = (BirthmarkSelection)value; setText(elem.getService().getDisplayType()); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkServiceListCellRenderer.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkServiceListCellRenderer.java index 2814f9a..da84ace 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkServiceListCellRenderer.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkServiceListCellRenderer.java @@ -45,6 +45,7 @@ public class BirthmarkServiceListCellRenderer extends JPanel implements ListCell this.setPreferredSize(dim); } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean hasFocus){ if(value instanceof BirthmarkSpi){ BirthmarkSpi service = (BirthmarkSpi)value; diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/ClasspathSettingsPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/ClasspathSettingsPane.java index b9ad473..416fd20 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/ClasspathSettingsPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/ClasspathSettingsPane.java @@ -145,22 +145,26 @@ public class ClasspathSettingsPane extends JPanel{ south.add(Box.createHorizontalGlue()); text.getDocument().addDocumentListener(new DocumentListener(){ + @Override public void changedUpdate(DocumentEvent arg0){ String t = text.getText(); findButton.setEnabled(t.trim().length() > 0); } + @Override public void insertUpdate(DocumentEvent arg0){ String t = text.getText(); findButton.setEnabled(t.trim().length() > 0); } + @Override public void removeUpdate(DocumentEvent arg0){ String t = text.getText(); findButton.setEnabled(t.trim().length() > 0); } }); ActionListener action = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ String t = text.getText().trim(); boolean flag = findClass(t); @@ -184,6 +188,7 @@ public class ClasspathSettingsPane extends JPanel{ }; classpath.addDataChangeListener(new DataChangeListener(){ + @Override public void valueChanged(Object source){ stigmata.setNeedToSaveSettings(true); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/ClippedLRListCellRenderer.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/ClippedLRListCellRenderer.java index 4aafde7..52c77ac 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/ClippedLRListCellRenderer.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/ClippedLRListCellRenderer.java @@ -43,6 +43,7 @@ public class ClippedLRListCellRenderer extends JPanel implements ListCellRendere setPreferredSize(dim); } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus){ LRItem item = (LRItem)value; diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/CompareTableCellRenderer.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/CompareTableCellRenderer.java index 9b9c20e..5622c43 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/CompareTableCellRenderer.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/CompareTableCellRenderer.java @@ -27,6 +27,7 @@ public class CompareTableCellRenderer extends DefaultTableCellRenderer{ this.environment = environment; } + @Override public Component getTableCellRendererComponent(JTable table, Object obj, boolean isSelected, boolean hasForcus, int row, int col){ Object value = table.getValueAt(row, col); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java index 1be1d3f..5f3fe9a 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java @@ -208,6 +208,7 @@ public class ControlPane extends JPanel{ mainPane.add(Box.createHorizontalGlue()); DataChangeListener dcl = new DataChangeListener(){ + @Override public void valueChanged(Object source){ updateEnable(); } @@ -371,18 +372,21 @@ public class ControlPane extends JPanel{ comparePopup.setEnabled(false); resetButton.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ reset(); } }); extractButton.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ extractButtonActionPerformed(e); } }); ActionListener compareListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ String command = e.getActionCommand(); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/ExtensionFilter.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/ExtensionFilter.java index 6c7062b..81b6c70 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/ExtensionFilter.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/ExtensionFilter.java @@ -57,6 +57,7 @@ public class ExtensionFilter extends FileFilter implements java.io.FileFilter{ return extensions.toArray(new String[extensions.size()]); } + @Override public boolean accept(File f){ String fileName = f.getName(); String extension = fileName.substring(fileName.lastIndexOf('.') + 1); @@ -79,6 +80,7 @@ public class ExtensionFilter extends FileFilter implements java.io.FileFilter{ this.description = description; } + @Override public String getDescription(){ return description; } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/ExtractedHistoryPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/ExtractedHistoryPane.java index 1390fbc..7876294 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/ExtractedHistoryPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/ExtractedHistoryPane.java @@ -83,6 +83,7 @@ public class ExtractedHistoryPane extends JPanel{ final Action showAction = new AbstractAction(){ private static final long serialVersionUID = 2156350514762218963L; + @Override public void actionPerformed(ActionEvent e){ showAction((String)model.get(list.getSelectedIndex())); } @@ -90,6 +91,7 @@ public class ExtractedHistoryPane extends JPanel{ final Action refreshAction = new AbstractAction(){ private static final long serialVersionUID = 214765021455345371L; + @Override public void actionPerformed(ActionEvent e){ updateList(); } @@ -97,6 +99,7 @@ public class ExtractedHistoryPane extends JPanel{ final Action deleteAction = new AbstractAction(){ private static final long serialVersionUID = 8145188292702648924L; + @Override public void actionPerformed(ActionEvent e){ int[] indeces = list.getSelectedIndices(); for(int i = indeces.length - 1; i >= 0; i--){ @@ -121,6 +124,7 @@ public class ExtractedHistoryPane extends JPanel{ showAction.setEnabled(false); list.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent e){ int[] indeces = list.getSelectedIndices(); showAction.setEnabled(currentHistory != null && indeces.length == 1); @@ -137,6 +141,7 @@ public class ExtractedHistoryPane extends JPanel{ } }); combo.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ updateList(); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/FilterManagementPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/FilterManagementPane.java index 90c7196..2aa4046 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/FilterManagementPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/FilterManagementPane.java @@ -67,6 +67,7 @@ public class FilterManagementPane extends JPanel implements ComparisonPairFilter } } + @Override public void addFilterSet(ComparisonPairFilterSet filterset){ filters.put(filterset.getName(), filterset); @@ -74,6 +75,7 @@ public class FilterManagementPane extends JPanel implements ComparisonPairFilter list.setSelectedIndex(model.getSize() - 1); } + @Override public void removeFilterSet(String name){ filters.remove(name); model.removeElement(name); @@ -81,6 +83,7 @@ public class FilterManagementPane extends JPanel implements ComparisonPairFilter list.clearSelection(); } + @Override public void updateFilterSet(String oldName, ComparisonPairFilterSet newfilter){ for(int i = 0; i < model.getSize(); i++){ if(oldName.equals(model.getElementAt(i))){ @@ -92,10 +95,12 @@ public class FilterManagementPane extends JPanel implements ComparisonPairFilter filters.put(newfilter.getName(), newfilter); } + @Override public ComparisonPairFilterSet getFilterSet(String name){ return filters.get(name); } + @Override public void filterSelected(ComparisonPairFilter filter){ filterPane.setFilter(filter); } @@ -139,6 +144,7 @@ public class FilterManagementPane extends JPanel implements ComparisonPairFilter } }); list.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent e){ int[] indexes = list.getSelectedIndices(); int rows = model.getSize(); @@ -154,6 +160,7 @@ public class FilterManagementPane extends JPanel implements ComparisonPairFilter } }); ActionListener listener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ int step = 1; if(e.getActionCommand().equals("moveup")){ diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/FilterSelectionPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/FilterSelectionPane.java index 90d812b..79566ba 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/FilterSelectionPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/FilterSelectionPane.java @@ -56,25 +56,30 @@ public class FilterSelectionPane extends JPanel implements ComparisonPairFilterR initLayout(); } + @Override public void addFilterSet(ComparisonPairFilterSet filter){ filters.put(filter.getName(), filter); enableMap.put(filter.getName(), false); model.addElement(filter.getName()); } + @Override public void filterSelected(ComparisonPairFilter filter){ } + @Override public ComparisonPairFilterSet getFilterSet(String name){ return filters.get(name); } + @Override public void removeFilterSet(String name){ filters.remove(name); enableMap.remove(name); model.removeElement(name); } + @Override public void updateFilterSet(String name, ComparisonPairFilterSet filter){ int index = model.indexOf(name); model.set(index, filter.getName()); @@ -111,6 +116,7 @@ public class FilterSelectionPane extends JPanel implements ComparisonPairFilterR add(filterDef, BorderLayout.CENTER); list.addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent e){ String name = (String)list.getSelectedValue(); filterDef.setFilterSet(filters.get(name)); @@ -142,6 +148,7 @@ public class FilterSelectionPane extends JPanel implements ComparisonPairFilterR setOpaque(true); } + @Override public Component getListCellRendererComponent(JList list, Object v, int index, boolean isSelected, boolean cellHasFocus){ String value = (String)v; setText(value); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/GUIUtility.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/GUIUtility.java index dcb566a..da298fa 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/GUIUtility.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/GUIUtility.java @@ -227,6 +227,7 @@ public class GUIUtility{ panel.add(label, BorderLayout.WEST); panel.add(button, BorderLayout.EAST); button.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ tabPane.remove(comp); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/PairComparisonPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/PairComparisonPane.java index dfc1051..55b6da0 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/PairComparisonPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/PairComparisonPane.java @@ -77,6 +77,7 @@ public class PairComparisonPane extends JPanel{ JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER)); JButton saveButton = GUIUtility.createButton( frame.getMessages(), "savecomparison", new SaveAction(frame, new AsciiDataWritable(){ + @Override public void writeAsciiData(PrintWriter out, String format) throws IOException{ ResultPrinterSpi service = PrinterManager.getInstance().getService(format); if(service == null){ diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/PairComparisonResultSetPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/PairComparisonResultSetPane.java index afa6e72..488ef6b 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/PairComparisonResultSetPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/PairComparisonResultSetPane.java @@ -127,6 +127,7 @@ public class PairComparisonResultSetPane extends JPanel{ JComponent southPanel = Box.createVerticalBox(); JButton saveButton = GUIUtility.createButton( frame.getMessages(), "savecomparison", new SaveAction(frame, new AsciiDataWritable(){ + @Override public void writeAsciiData(PrintWriter out, String format) throws IOException{ ResultPrinterSpi service = PrinterManager.getInstance().getService(format); if(service == null){ @@ -169,6 +170,7 @@ public class PairComparisonResultSetPane extends JPanel{ buttonPanel.add(Box.createHorizontalGlue()); table.addMouseListener(new MouseAdapter(){ + @Override public void mouseClicked(MouseEvent e){ if(e.getClickCount() == 2){ int row = table.rowAtPoint(e.getPoint()); @@ -184,6 +186,7 @@ public class PairComparisonResultSetPane extends JPanel{ }); obfuscateButton.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ obfuscateClassNames(); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/PopupButton.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/PopupButton.java index 2505c3f..2102fd4 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/PopupButton.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/PopupButton.java @@ -36,6 +36,7 @@ public class PopupButton extends JPanel{ popup = new JPopupMenu(); arrowButton.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ Point p = button.getLocation(); popup.show(PopupButton.this, p.x, button.getHeight()); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/PropertyEditPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/PropertyEditPane.java index 4df9320..65a1979 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/PropertyEditPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/PropertyEditPane.java @@ -67,6 +67,7 @@ public class PropertyEditPane extends JPanel{ private void initData(){ BirthmarkEnvironment environment = stigmata.getEnvironment(); environment.addPropertyListener(new PropertyChangeListener(){ + @Override public void propertyChange(PropertyChangeEvent evt){ String name = evt.getPropertyName(); String value = (String)evt.getNewValue(); @@ -185,6 +186,7 @@ public class PropertyEditPane extends JPanel{ Action addAction = new AbstractAction(){ private static final long serialVersionUID = 1283676936119122278L; + @Override public void actionPerformed(ActionEvent e){ addNewProperty(-1); } @@ -192,6 +194,7 @@ public class PropertyEditPane extends JPanel{ final Action removeAction = new AbstractAction(){ private static final long serialVersionUID = -411260949451039374L; + @Override public void actionPerformed(ActionEvent e){ removeSelectedProperty(); } @@ -199,6 +202,7 @@ public class PropertyEditPane extends JPanel{ final Action editAction = new AbstractAction(){ private static final long serialVersionUID = -7406073660916286349L; + @Override public void actionPerformed(ActionEvent e){ addNewProperty(table.getSelectedRow()); } @@ -235,6 +239,7 @@ public class PropertyEditPane extends JPanel{ add(box, BorderLayout.SOUTH); table.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent arg0){ removeAction.setEnabled(table.getSelectedRowCount() != 0); editAction.setEnabled(table.getSelectedRowCount() == 1); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/RoundRobinComparisonResultPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/RoundRobinComparisonResultPane.java index dad3243..a3fd83e 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/RoundRobinComparisonResultPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/RoundRobinComparisonResultPane.java @@ -162,6 +162,7 @@ public class RoundRobinComparisonResultPane extends JPanel{ table = new JTable(model); table.setDefaultRenderer(Double.class, new CompareTableCellRenderer(extraction.getEnvironment())); table.addMouseListener(new MouseAdapter(){ + @Override public void mouseClicked(MouseEvent e){ if(e.getClickCount() == 2){ int row = table.rowAtPoint(e.getPoint()); @@ -248,6 +249,7 @@ public class RoundRobinComparisonResultPane extends JPanel{ final Messages messages = stigmata.getMessages(); JButton save = GUIUtility.createButton( messages, "savecomparison", new SaveAction(stigmata, new AsciiDataWritable(){ + @Override public void writeAsciiData(PrintWriter out, String format){ ResultPrinterSpi service = PrinterManager.getInstance().getService(format); if(service == null){ @@ -290,23 +292,27 @@ public class RoundRobinComparisonResultPane extends JPanel{ southPanel.add(Box.createHorizontalGlue()); graph.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ graphButtonActionPerformed(e); } }); mdsMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ mdsButtonActionPerformed(e); } }); obfuscate.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ obfuscateClassNames(); } }); ActionListener compareListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ String item = e.getActionCommand(); if(item.equals("guessedpair")){ @@ -418,6 +424,7 @@ public class RoundRobinComparisonResultPane extends JPanel{ return false; } + @Override public Class getColumnClass(int column){ if(column == 0){ return String.class; diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java index cd6f0df..da988aa 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java @@ -512,6 +512,7 @@ public class StigmataFrame extends JFrame{ add(tabPane, BorderLayout.CENTER); tabPane.addChangeListener(new ChangeListener(){ + @Override public void stateChanged(ChangeEvent arg0){ String title = tabPane.getTitleAt(tabPane.getSelectedIndex()); closeTabMenu.setEnabled(!title.equals(getMessages().get("control.tab.label"))); @@ -555,11 +556,13 @@ public class StigmataFrame extends JFrame{ pluginsMenu.add(onlineUpdate); installMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent evt){ installPlugin(); } }); onlineUpdate.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ onlineUpdate(); } @@ -595,12 +598,14 @@ public class StigmataFrame extends JFrame{ fileMenu.add(exitMenu); newFrameMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent evt){ StigmataFrame frame = new StigmataFrame(stigmata, environment); frame.setVisible(true); } }); saveMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ control.saveSettings(new File(BirthmarkEnvironment.getStigmataHome(), "stigmata.xml")); setNeedToSaveSettings(false); @@ -608,30 +613,35 @@ public class StigmataFrame extends JFrame{ }); exportMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ control.exportSettings(); } }); closeTabMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent evt){ closeTabMenuActionPerformed(); } }); clearMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent evt){ clearSettings(); } }); refreshMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent evt){ reloadSettings(new String[] { "gui", }); } }); closeMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent evt){ setVisible(false); dispose(); @@ -639,6 +649,7 @@ public class StigmataFrame extends JFrame{ }); exitMenu.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent evt){ System.exit(0); } @@ -662,6 +673,7 @@ public class StigmataFrame extends JFrame{ menu.add(experimentalMode); experimentalMode.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ updateExperimentalModeState(((JCheckBoxMenuItem)e.getSource()).getState()); } @@ -678,6 +690,7 @@ public class StigmataFrame extends JFrame{ LookAndFeel lookfeel = UIManager.getLookAndFeel(); ActionListener listener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ try{ String command = e.getActionCommand(); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/TargetSelectionPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/TargetSelectionPane.java index 6ce2284..80b672e 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/TargetSelectionPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/TargetSelectionPane.java @@ -220,6 +220,7 @@ public class TargetSelectionPane extends JPanel{ addAction = new AbstractAction(){ private static final long serialVersionUID = 1406018312294328837L; + @Override public void actionPerformed(ActionEvent e){ addButtonActionPerformed(e); } @@ -227,6 +228,7 @@ public class TargetSelectionPane extends JPanel{ removeAction = new AbstractAction(){ private static final long serialVersionUID = 7910621850068803554L; + @Override public void actionPerformed(ActionEvent e){ removeButtonActionPerformed(e); } @@ -250,6 +252,7 @@ public class TargetSelectionPane extends JPanel{ south.add(Box.createHorizontalGlue()); list.addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent evt){ listValueChanged(evt); } @@ -304,6 +307,7 @@ public class TargetSelectionPane extends JPanel{ this.list = list; } + @Override public void dragGestureRecognized(DragGestureEvent dge){ int[] indeces = list.getSelectedIndices(); if(indeces.length > 0){ @@ -321,7 +325,6 @@ public class TargetSelectionPane extends JPanel{ } }; - @SuppressWarnings("unchecked") private class TargetSelectionDropTarget extends DropTarget{ private static final long serialVersionUID = 3204457621345L; @@ -343,8 +346,8 @@ public class TargetSelectionPane extends JPanel{ Transferable trans = dtde.getTransferable(); try{ if(trans.isDataFlavorSupported(DataFlavor.javaFileListFlavor)){ - List list = (List)trans - .getTransferData(DataFlavor.javaFileListFlavor); + @SuppressWarnings("rawtypes") + List list = (List)trans.getTransferData(DataFlavor.javaFileListFlavor); List errorList = checkAndAddDroppedFile(list); if(errorList.size() > 0){ showError(errorList); @@ -359,6 +362,7 @@ public class TargetSelectionPane extends JPanel{ public void dropActionChanged(DropTargetDragEvent arg0){ } + @SuppressWarnings("rawtypes") private List checkAndAddDroppedFile(List list){ List errorList = new ArrayList(); @@ -402,6 +406,7 @@ public class TargetSelectionPane extends JPanel{ this.strings = strings; } + @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException{ List list = new ArrayList(); @@ -411,10 +416,12 @@ public class TargetSelectionPane extends JPanel{ return list; } + @Override public DataFlavor[] getTransferDataFlavors(){ return new DataFlavor[] { DataFlavor.javaFileListFlavor, }; } + @Override public boolean isDataFlavorSupported(DataFlavor flavor){ return flavor.equals(DataFlavor.javaFileListFlavor); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/UpdatePluginsPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/UpdatePluginsPane.java index ea23aea..10bb109 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/UpdatePluginsPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/UpdatePluginsPane.java @@ -125,6 +125,7 @@ public class UpdatePluginsPane extends JPanel{ final JButton updateButton = GUIUtility.createButton(stigmata.getMessages(), "hermes.update"); checkButton.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ try{ showLists(); @@ -137,6 +138,7 @@ public class UpdatePluginsPane extends JPanel{ } }); updateButton.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ try{ if(applyLicenses()){ @@ -182,14 +184,17 @@ public class UpdatePluginsPane extends JPanel{ this.pane = pane; } + @Override public void downloadDone(HermesEvent e){ Artifact a = e.getArtifact(); model.setValueAt(ProgressRenderer.DONE, map.get(a.getGroupId()).get(a.getArtifactId()), ProgressRenderer.PROGRESS_COLUMN); } + @Override public void fileSizeGotten(HermesEvent e){ } + @Override public void progress(HermesEvent e, double progress){ Artifact a = e.getArtifact(); model.setValueAt( @@ -198,9 +203,11 @@ public class UpdatePluginsPane extends JPanel{ ); } + @Override public void finish(HermesEvent e){ } + @Override public void targetResolved(HermesEvent e){ Artifact[] artifacts = e.getArtifacts(); map = buildArtifactsIndexMap(artifacts); @@ -322,13 +329,14 @@ public class UpdatePluginsPane extends JPanel{ model.addRow(new String[] { artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), }); } table.addMouseListener(new MouseAdapter(){ + @Override public void mouseClicked(MouseEvent e){ int row = ((JTable)e.getSource()).rowAtPoint(e.getPoint()); License[] licenses = artifacts[row].getPom().getLicenses(); licenseNames.removeAllItems(); for(int i = 0; i < licenses.length; i++){ - licenseNames.addItem(licenses[i]); + licenseNames.addItem(licenses[i].getName()); } if(licenses.length > 0){ licenseNames.setSelectedIndex(0); @@ -339,6 +347,7 @@ public class UpdatePluginsPane extends JPanel{ } }); licenseNames.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ String name = (String)((JComboBox)e.getSource()).getSelectedItem(); boolean missingLicenseFlag = true; diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/WellknownClassesSettingsPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/WellknownClassesSettingsPane.java index 25ca80e..65e307a 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/WellknownClassesSettingsPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/WellknownClassesSettingsPane.java @@ -151,6 +151,7 @@ public class WellknownClassesSettingsPane extends JPanel{ checkButton.setEnabled(false); ActionListener listener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ String t = text.getText().trim(); if(t.length() > 0){ @@ -176,14 +177,17 @@ public class WellknownClassesSettingsPane extends JPanel{ checkButton.addActionListener(listener); text.addActionListener(listener); text.getDocument().addDocumentListener(new DocumentListener(){ + @Override public void changedUpdate(DocumentEvent arg0){ checkButton.setEnabled(text.getText().trim().length() > 0); } + @Override public void insertUpdate(DocumentEvent arg0){ checkButton.setEnabled(text.getText().trim().length() > 0); } + @Override public void removeUpdate(DocumentEvent arg0){ checkButton.setEnabled(text.getText().trim().length() > 0); } @@ -208,6 +212,7 @@ public class WellknownClassesSettingsPane extends JPanel{ Action addAction = new AbstractAction(){ private static final long serialVersionUID = -8749957850400877529L; + @Override public void actionPerformed(ActionEvent e){ addRule(createOrUpdateRule(messages, null)); } @@ -215,6 +220,7 @@ public class WellknownClassesSettingsPane extends JPanel{ final Action removeAction = new AbstractAction(){ private static final long serialVersionUID = 8776209200186477040L; + @Override public void actionPerformed(ActionEvent e){ int[] indeces = list.getSelectedIndices(); for(int i = indeces.length - 1; i >= 0; i--){ @@ -227,6 +233,7 @@ public class WellknownClassesSettingsPane extends JPanel{ final Action updateAction = new AbstractAction(){ private static final long serialVersionUID = 852965501722574084L; + @Override public void actionPerformed(ActionEvent e){ editRule(list.getSelectedIndex()); } @@ -260,6 +267,7 @@ public class WellknownClassesSettingsPane extends JPanel{ list.addMouseListener(new PopupShowAction(popup)); list.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent arg0){ int[] indeces = list.getSelectedIndices(); removeAction.setEnabled(indeces != null && indeces.length > 0); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ChangeColorAction.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ChangeColorAction.java index 293cb2f..761193a 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ChangeColorAction.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ChangeColorAction.java @@ -56,12 +56,14 @@ public class ChangeColorAction extends AbstractAction{ return currentColor; } + @Override public void actionPerformed(ActionEvent e){ chooser.setColor(currentColor); JDialog dialog = JColorChooser.createDialog( frame, frame.getMessages().get("changecolor.title"), true, chooser, new ActionListener(){ // ok + @Override public void actionPerformed(ActionEvent e){ currentColor = chooser.getColor(); colorSelected = true; @@ -69,6 +71,7 @@ public class ChangeColorAction extends AbstractAction{ } }, new ActionListener(){ // cancel + @Override public void actionPerformed(ActionEvent e){ colorSelected = false; } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/LicenseAction.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/LicenseAction.java index 046e53f..e39894b 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/LicenseAction.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/LicenseAction.java @@ -18,10 +18,12 @@ public class LicenseAction extends ShowTextAction{ super(parent); } + @Override public String getTitle(){ return getMessages().get("license.dialog.title"); } + @Override public String getMessage(){ return loadStringFromFile(GUIUtility.getResource(getMessages(), "license.file")); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/LinkFollower.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/LinkFollower.java index 1ba3eeb..10ff257 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/LinkFollower.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/LinkFollower.java @@ -16,6 +16,7 @@ import javax.swing.event.HyperlinkListener; * @version $Revision$ */ class LinkFollower implements HyperlinkListener{ + @Override public void hyperlinkUpdate(HyperlinkEvent e){ if(e.getEventType() == HyperlinkEvent.EventType.ACTIVATED){ URL url = null; diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/OpenSettingDirAction.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/OpenSettingDirAction.java index c2e776e..05389fc 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/OpenSettingDirAction.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/OpenSettingDirAction.java @@ -32,6 +32,7 @@ public class OpenSettingDirAction extends AbstractAction{ this.messages = messages; } + @Override public void actionPerformed(ActionEvent e){ String home = BirthmarkEnvironment.getStigmataHome(); Desktop desktop = Desktop.getDesktop(); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/SaveAction.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/SaveAction.java index 42746a2..7dd099a 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/SaveAction.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/SaveAction.java @@ -53,6 +53,7 @@ public class SaveAction extends AbstractAction{ this.description = description; } + @Override public void actionPerformed(ActionEvent e){ if(extensions == null || description == null){ extensions = stigmata.getMessages().getArray("store.extensions"); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ShowTextAction.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ShowTextAction.java index 12c128b..ceb65b2 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ShowTextAction.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/ShowTextAction.java @@ -52,6 +52,7 @@ abstract class ShowTextAction extends AbstractAction{ return parent.getMessages(); } + @Override public void actionPerformed(ActionEvent e){ String message = getMessage(); JPanel panel = new JPanel(new BorderLayout()); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java index 3e3f61b..db07a80 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java @@ -44,6 +44,7 @@ public class UpdateBirthmarkCellColorAction extends AbstractAction{ this(parent, BirthmarkEnvironment.getDefaultEnvironment()); } + @Override public void actionPerformed(ActionEvent e){ JComponent c = createPanel(); JOptionPane.showMessageDialog( @@ -107,6 +108,7 @@ public class UpdateBirthmarkCellColorAction extends AbstractAction{ JButton back = GUIUtility.createButton(parent.getMessages(), "updatecellback"); ActionListener listener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ String command = e.getActionCommand(); boolean foreground = command.equals("updatecellfore"); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/AbstractComparisonPairFilterComponentService.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/AbstractComparisonPairFilterComponentService.java index 9be8226..def1808 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/AbstractComparisonPairFilterComponentService.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/AbstractComparisonPairFilterComponentService.java @@ -14,10 +14,12 @@ import jp.sourceforge.stigmata.utils.LocalizedDescriptionManager; * @version $Revision$ */ public abstract class AbstractComparisonPairFilterComponentService implements ComparisonPairFilterComponentService{ + @Override public String getDisplayFilterName(){ return getDisplayFilterName(Locale.getDefault()); } + @Override public String getDisplayFilterName(Locale locale){ return LocalizedDescriptionManager.getInstance().getDisplayType( locale, getFilterName(), LocalizedDescriptionManager.ServiceCategory.filter diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/BirthmarkElementCountComparisonPairFilterComponentService.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/BirthmarkElementCountComparisonPairFilterComponentService.java index d836b82..ffce2a8 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/BirthmarkElementCountComparisonPairFilterComponentService.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/BirthmarkElementCountComparisonPairFilterComponentService.java @@ -31,23 +31,28 @@ import jp.sourceforge.stigmata.ui.swing.StigmataFrame; public class BirthmarkElementCountComparisonPairFilterComponentService extends AbstractComparisonPairFilterComponentService implements BirthmarkServiceListener{ private Pane pane; + @Override public ComparisonPairFilterPane createComponent(StigmataFrame frame, ComparisonPairFilterSpi service){ pane = new Pane(frame, service); return pane; } + @Override public String getFilterName(){ return "elementcount"; } + @Override public void serviceAdded(BirthmarkSpi service){ pane.serviceAdded(service); } + @Override public void serviceRemoved(BirthmarkSpi service){ pane.serviceRemoved(service); } + @Override public ComparisonPairFilterSpi getComparisonPairFilterService(){ return new BirthmarkElementCountComparisonPairFilterService(); } @@ -67,10 +72,12 @@ public class BirthmarkElementCountComparisonPairFilterComponentService extends A initLayouts(); } + @Override public void serviceAdded(BirthmarkSpi service){ birthmarks.addItem(service); } + @Override public void serviceRemoved(BirthmarkSpi service){ birthmarks.removeItem(service); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/FilterEditingPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/FilterEditingPane.java index fde54a6..e755064 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/FilterEditingPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/FilterEditingPane.java @@ -142,6 +142,7 @@ public class FilterEditingPane extends JPanel{ updateButton = GUIUtility.createButton(messages, "updatefilter"); combo.addItemListener(new ItemListener(){ + @Override public void itemStateChanged(ItemEvent e){ String item = (String)combo.getSelectedItem(); card.show(cardComponent, item); @@ -164,6 +165,7 @@ public class FilterEditingPane extends JPanel{ } }); ActionListener listener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ String command = e.getActionCommand(); ComparisonPairFilter newfilter = currentPane.getFilter(); @@ -185,6 +187,7 @@ public class FilterEditingPane extends JPanel{ addButton.addActionListener(listener); updateButton.addActionListener(listener); removeButton.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ for(ComparisonPairFilterListener listener: listeners){ listener.filterRemoved(filter); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/FilterSetDefinitionPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/FilterSetDefinitionPane.java index dcba410..c458508 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/FilterSetDefinitionPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/FilterSetDefinitionPane.java @@ -83,18 +83,21 @@ public class FilterSetDefinitionPane extends JPanel implements ComparisonPairFil } } + @Override public void filterAdded(ComparisonPairFilter filter){ model.addElement(filter); list.setSelectedIndex(model.getSize() - 1); updateButtonEnabled(); } + @Override public void filterRemoved(ComparisonPairFilter filter){ model.removeElement(filter); list.clearSelection(); updateButtonEnabled(); } + @Override public void filterUpdated(ComparisonPairFilter oldfilter, ComparisonPairFilter newfilter){ int index = model.indexOf(oldfilter); if(index >= 0){ @@ -103,6 +106,7 @@ public class FilterSetDefinitionPane extends JPanel implements ComparisonPairFil updateButtonEnabled(); } + @Override public void setEnabled(boolean flag){ super.setEnabled(flag); @@ -153,6 +157,7 @@ public class FilterSetDefinitionPane extends JPanel implements ComparisonPairFil list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent e){ manager.filterSelected((ComparisonPairFilter)list.getSelectedValue()); updateButtonEnabled(); @@ -160,6 +165,7 @@ public class FilterSetDefinitionPane extends JPanel implements ComparisonPairFil }); addfilter.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ ComparisonPairFilterSet current = createCurrentFilterSet(); filterset = current; @@ -172,6 +178,7 @@ public class FilterSetDefinitionPane extends JPanel implements ComparisonPairFil }); removefilter.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ manager.removeFilterSet(filterset.getName()); filterset = null; @@ -186,6 +193,7 @@ public class FilterSetDefinitionPane extends JPanel implements ComparisonPairFil }); updatefilter.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ ComparisonPairFilterSet current = createCurrentFilterSet(); manager.updateFilterSet(filterset.getName(), current); @@ -197,6 +205,7 @@ public class FilterSetDefinitionPane extends JPanel implements ComparisonPairFil }); ActionListener listener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ int index = list.getSelectedIndex(); int step = 1; @@ -209,14 +218,17 @@ public class FilterSetDefinitionPane extends JPanel implements ComparisonPairFil } }; name.getDocument().addDocumentListener(new DocumentListener(){ + @Override public void changedUpdate(DocumentEvent e){ updateButtonEnabled(); } + @Override public void insertUpdate(DocumentEvent e){ updateButtonEnabled(); } + @Override public void removeUpdate(DocumentEvent e){ updateButtonEnabled(); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/SimilarityComparisonPairFilterComponentService.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/SimilarityComparisonPairFilterComponentService.java index bfc75c0..ef81d9b 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/SimilarityComparisonPairFilterComponentService.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/SimilarityComparisonPairFilterComponentService.java @@ -27,14 +27,17 @@ import jp.sourceforge.stigmata.ui.swing.StigmataFrame; */ public class SimilarityComparisonPairFilterComponentService extends AbstractComparisonPairFilterComponentService{ + @Override public ComparisonPairFilterPane createComponent(StigmataFrame frame, ComparisonPairFilterSpi service){ return new Pane(frame, service); } + @Override public String getFilterName(){ return "similarity"; } + @Override public ComparisonPairFilterSpi getComparisonPairFilterService(){ return new SimilarityComparisonPairFilterService(); } @@ -114,12 +117,15 @@ public class SimilarityComparisonPairFilterComponentService extends AbstractComp add(threshold); threshold.getDocument().addDocumentListener(new DocumentListener(){ + @Override public void changedUpdate(DocumentEvent e){ } + @Override public void insertUpdate(DocumentEvent e){ } + @Override public void removeUpdate(DocumentEvent e){ } }); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/TargetNameComparisonPairFilterComponentService.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/TargetNameComparisonPairFilterComponentService.java index 30b731a..742c1ef 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/TargetNameComparisonPairFilterComponentService.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/TargetNameComparisonPairFilterComponentService.java @@ -25,14 +25,17 @@ import jp.sourceforge.stigmata.ui.swing.StigmataFrame; */ public class TargetNameComparisonPairFilterComponentService extends AbstractComparisonPairFilterComponentService{ + @Override public ComparisonPairFilterPane createComponent(StigmataFrame frame, ComparisonPairFilterSpi service){ return new Pane(frame, service); } + @Override public String getFilterName(){ return "name"; } + @Override public ComparisonPairFilterSpi getComparisonPairFilterService(){ return new TargetNameComparisonPairFilterService(); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/TotalElementCountComparisonPairFilterComponentService.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/TotalElementCountComparisonPairFilterComponentService.java index 7bb424e..402aa69 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/TotalElementCountComparisonPairFilterComponentService.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/filter/TotalElementCountComparisonPairFilterComponentService.java @@ -25,14 +25,17 @@ import jp.sourceforge.stigmata.ui.swing.StigmataFrame; */ public class TotalElementCountComparisonPairFilterComponentService extends AbstractComparisonPairFilterComponentService{ + @Override public ComparisonPairFilterPane createComponent(StigmataFrame frame, ComparisonPairFilterSpi service){ return new Pane(frame, service); } + @Override public String getFilterName(){ return "totalelementcount"; } + @Override public ComparisonPairFilterSpi getComparisonPairFilterService(){ return new TotalElementCountComparisonPairFilterService(); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/graph/SimilarityDistributionGraphPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/graph/SimilarityDistributionGraphPane.java index 106f715..da42ee3 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/graph/SimilarityDistributionGraphPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/graph/SimilarityDistributionGraphPane.java @@ -149,6 +149,7 @@ public class SimilarityDistributionGraphPane extends JPanel{ Box south = Box.createHorizontalBox(); JButton storeImageButton = GUIUtility.createButton(stigmata.getMessages(), "savegraph"); JButton switchColorButton = new JButton(new ChangeColorAction(stigmata, new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ ChangeColorAction action = (ChangeColorAction)e.getSource(); if(action.isColorSelected()){ @@ -157,6 +158,7 @@ public class SimilarityDistributionGraphPane extends JPanel{ } })); storeImageButton.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ storeGraphImage(); } diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsImageExporter.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsImageExporter.java index 1cca796..3ef9793 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsImageExporter.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsImageExporter.java @@ -30,6 +30,7 @@ public class MdsImageExporter implements BinaryDataWritable{ this.viewer = viewer; } + @Override public void writeBinaryData(OutputStream out, String format) throws IOException, UnsupportedFormatException{ Dimension size = viewer.getSize(); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsItemsLocationExporter.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsItemsLocationExporter.java index 4386a50..b4b91e5 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsItemsLocationExporter.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsItemsLocationExporter.java @@ -24,6 +24,7 @@ public class MdsItemsLocationExporter implements AsciiDataWritable{ this.viewer = viewer; } + @Override public void writeAsciiData(PrintWriter out, String format) throws IOException, UnsupportedFormatException{ if(!format.equals("csv")){ diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsViewerPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsViewerPane.java index f9b513d..6fc1479 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsViewerPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/MdsViewerPane.java @@ -91,12 +91,14 @@ public class MdsViewerPane extends JPanel implements ZoomEnabler, MessageManager } } + @Override public void zoomIn(){ currentZoomPattern++; userInputtedValue = false; zoom(ZOOM_PATTERN[currentZoomPattern]); } + @Override public void zoomOut(){ if(!userInputtedValue){ currentZoomPattern--; @@ -105,6 +107,7 @@ public class MdsViewerPane extends JPanel implements ZoomEnabler, MessageManager zoom(ZOOM_PATTERN[currentZoomPattern]); } + @Override public void zoom(int ratio){ for(int i = 0; i < ZOOM_PATTERN.length; i++){ if(ratio <= ZOOM_PATTERN[i]){ @@ -125,6 +128,7 @@ public class MdsViewerPane extends JPanel implements ZoomEnabler, MessageManager mdspane.setZoomRatio(ratio); } + @Override public Messages getMessages(){ return stigmata.getMessages(); } @@ -182,6 +186,7 @@ public class MdsViewerPane extends JPanel implements ZoomEnabler, MessageManager JCheckBox check = new JCheckBox(stigmata.getMessages().get("showlabel.button.label"), true); check.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ JCheckBox c = (JCheckBox)e.getSource(); setting.setShowLabels(c.isSelected()); @@ -210,6 +215,7 @@ public class MdsViewerPane extends JPanel implements ZoomEnabler, MessageManager GUIUtility.decorateJComponent(messages, zoomRatio, "mdszoomratio"); zoomRatio.setColumns(5); zoomRatio.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ try{ String label = zoomRatio.getText(); diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/OpenItemsAction.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/OpenItemsAction.java index 32635fe..98cde0e 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/OpenItemsAction.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/mds/OpenItemsAction.java @@ -43,6 +43,7 @@ public class OpenItemsAction extends AbstractAction{ putValue(SMALL_ICON, icon); } initMdsPane.addItemsSelectionListener(new ItemsSelectionListener(){ + @Override public void valueChanged(ItemsSelectionEvent e){ Item[] items = mdsPane.getSelectedItems(); selectedItemFlag = items.length != 0; @@ -55,12 +56,14 @@ public class OpenItemsAction extends AbstractAction{ } }); initMdsPane.addItemsOpenListener(new ItemsOpenListener(){ + @Override public void itemOpened(ItemsOpenEvent e){ showItems(e.getItems()); } }); } + @Override public void actionPerformed(ActionEvent e){ Item[] items; if(selectedItemFlag){ diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/tab/EditableGlassPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/tab/EditableGlassPane.java index c8cacee..51c52ed 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/tab/EditableGlassPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/tab/EditableGlassPane.java @@ -31,6 +31,7 @@ class EditableGlassPane extends JPanel{ setOpaque(false); addMouseListener(new MouseAdapter(){ + @Override public void mouseClicked(MouseEvent e){ if(rect == null || rect.contains(e.getPoint())) return; diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/tab/EditableTabbedPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/tab/EditableTabbedPane.java index fd4b5dd..76dda76 100644 --- a/src/main/java/jp/sourceforge/stigmata/ui/swing/tab/EditableTabbedPane.java +++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/tab/EditableTabbedPane.java @@ -45,11 +45,13 @@ public class EditableTabbedPane extends JTabbedPane{ editor.setBorder(BorderFactory.createEmptyBorder(0, 3, 0, 3)); editor.addFocusListener(new FocusAdapter(){ + @Override public void focusGained(final FocusEvent e){ ((JTextField)e.getSource()).selectAll(); } }); editor.addKeyListener(new KeyAdapter(){ + @Override public void keyPressed(KeyEvent e){ if(e.getKeyCode() == KeyEvent.VK_ENTER){ renameTab(); @@ -60,6 +62,7 @@ public class EditableTabbedPane extends JTabbedPane{ } }); addMouseListener(new MouseAdapter(){ + @Override public void mouseClicked(MouseEvent me){ if(me.getClickCount() == 2){ startEditing(); @@ -67,6 +70,7 @@ public class EditableTabbedPane extends JTabbedPane{ } }); addKeyListener(new KeyAdapter(){ + @Override public void keyPressed(KeyEvent e){ if(e.getKeyCode() == KeyEvent.VK_ENTER){ startEditing(); diff --git a/src/main/java/jp/sourceforge/stigmata/utils/ArrayIterator.java b/src/main/java/jp/sourceforge/stigmata/utils/ArrayIterator.java index ea8ebde..e4d4910 100644 --- a/src/main/java/jp/sourceforge/stigmata/utils/ArrayIterator.java +++ b/src/main/java/jp/sourceforge/stigmata/utils/ArrayIterator.java @@ -26,16 +26,19 @@ public class ArrayIterator implements Iterator{ } } + @Override public boolean hasNext(){ return currentIndex < length; } + @Override public T next(){ T value = values[currentIndex]; currentIndex++; return value; } + @Override public void remove(){ } } diff --git a/src/main/java/jp/sourceforge/stigmata/utils/ConfigFileExporter.java b/src/main/java/jp/sourceforge/stigmata/utils/ConfigFileExporter.java index 2ab8e76..ae0aa5c 100644 --- a/src/main/java/jp/sourceforge/stigmata/utils/ConfigFileExporter.java +++ b/src/main/java/jp/sourceforge/stigmata/utils/ConfigFileExporter.java @@ -114,7 +114,7 @@ public class ConfigFileExporter{ out.println(" "); } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private void exportFilters(PrintWriter out) throws IOException{ out.println(" "); for(ComparisonPairFilterSet filterset: environment.getFilterManager().getFilterSets()){ diff --git a/src/main/java/jp/sourceforge/stigmata/utils/MultipleIterator.java b/src/main/java/jp/sourceforge/stigmata/utils/MultipleIterator.java index 6d6b618..5f3a659 100644 --- a/src/main/java/jp/sourceforge/stigmata/utils/MultipleIterator.java +++ b/src/main/java/jp/sourceforge/stigmata/utils/MultipleIterator.java @@ -42,6 +42,7 @@ public class MultipleIterator implements Iterator{ iterators.add(iterator); } + @Override public boolean hasNext(){ while(index < iterators.size()){ boolean next = iterators.get(index).hasNext(); @@ -55,6 +56,7 @@ public class MultipleIterator implements Iterator{ /** */ + @Override public T next(){ if(!iterators.get(index).hasNext()){ index++; @@ -70,6 +72,7 @@ public class MultipleIterator implements Iterator{ return iterators.get(index).next(); } + @Override public void remove(){ iterators.get(index).remove(); } diff --git a/src/main/java/jp/sourceforge/stigmata/utils/NullIterator.java b/src/main/java/jp/sourceforge/stigmata/utils/NullIterator.java index 97e2d29..0bbdc6f 100644 --- a/src/main/java/jp/sourceforge/stigmata/utils/NullIterator.java +++ b/src/main/java/jp/sourceforge/stigmata/utils/NullIterator.java @@ -13,14 +13,17 @@ import java.util.NoSuchElementException; * @version $Revision$ */ public class NullIterator implements Iterator{ + @Override public boolean hasNext(){ return false; } + @Override public T next(){ throw new NoSuchElementException("no more object"); } + @Override public void remove(){ } } diff --git a/src/main/java/jp/sourceforge/stigmata/utils/WellknownClassJudgeRule.java b/src/main/java/jp/sourceforge/stigmata/utils/WellknownClassJudgeRule.java index 82126e8..159edca 100644 --- a/src/main/java/jp/sourceforge/stigmata/utils/WellknownClassJudgeRule.java +++ b/src/main/java/jp/sourceforge/stigmata/utils/WellknownClassJudgeRule.java @@ -55,6 +55,7 @@ public final class WellknownClassJudgeRule{ return partType; } + @Override public int hashCode(){ int m = getMatchType().hashCode(); int p = getMatchPartType().hashCode(); @@ -63,6 +64,7 @@ public final class WellknownClassJudgeRule{ return m + p + s; } + @Override public boolean equals(Object o){ if(o instanceof WellknownClassJudgeRule){ WellknownClassJudgeRule wcjr = (WellknownClassJudgeRule)o; @@ -73,6 +75,7 @@ public final class WellknownClassJudgeRule{ return false; } + @Override public String toString(){ String string = null; switch(getMatchType()){ diff --git a/src/main/java/jp/sourceforge/stigmata/utils/WellknownClassManager.java b/src/main/java/jp/sourceforge/stigmata/utils/WellknownClassManager.java index 16011fe..c9f297c 100644 --- a/src/main/java/jp/sourceforge/stigmata/utils/WellknownClassManager.java +++ b/src/main/java/jp/sourceforge/stigmata/utils/WellknownClassManager.java @@ -27,12 +27,10 @@ public class WellknownClassManager implements Iterable{ /** * private field/method flag defined in JVM specification. */ - @SuppressWarnings("unused") private static final int OPCODE_ACC_PRIVATE = 2; /** * protected field/method flag defined in JVM specification. */ - @SuppressWarnings("unused") private static final int OPCODE_ACC_PROTECTED = 4; /** * static field/method flag defined in JVM specification. @@ -68,6 +66,7 @@ public class WellknownClassManager implements Iterable{ rules.clear(); } + @Override public synchronized Iterator iterator(){ List copiedRules = new ArrayList(rules); return copiedRules.iterator(); -- 2.11.0