From 2a61875e8dc17a6c5192b36830d22abb475d04ca Mon Sep 17 00:00:00 2001 From: tama3 Date: Fri, 13 Jul 2007 06:08:06 +0000 Subject: [PATCH] rename classes git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@164 acee48c3-7b26-0410-bdac-b3d0e5314bbc --- .../BirthmarkElementClassNotFoundException.java | 2 +- ...ava => BirthmarkExtractionFailedException.java} | 10 +++--- .../jp/naist/se/stigmata/BirthmarkExtractor.java | 16 +++++----- src/main/java/jp/naist/se/stigmata/Stigmata.java | 36 +++++++++++----------- .../stigmata/birthmarks/ASMBirthmarkExtractor.java | 6 ++-- .../birthmarks/AbstractBirthmarkExtractor.java | 18 +++++------ .../is/InheritanceStructureBirthmarkExtractor.java | 4 +-- .../se/stigmata/event/BirthmarkEngineAdapter.java | 24 +++++++++++++++ ...erationEvent.java => BirthmarkEngineEvent.java} | 13 ++++++-- .../se/stigmata/event/BirthmarkEngineListener.java | 22 +++++++++++++ .../naist/se/stigmata/event/OperationAdapter.java | 24 --------------- .../naist/se/stigmata/event/OperationListener.java | 13 -------- .../jp/naist/se/stigmata/event/OperationType.java | 9 ++++++ .../naist/se/stigmata/ui/swing/StigmataFrame.java | 14 ++++----- 14 files changed, 119 insertions(+), 92 deletions(-) rename src/main/java/jp/naist/se/stigmata/{BirthmarkExtractionException.java => BirthmarkExtractionFailedException.java} (70%) create mode 100755 src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineAdapter.java rename src/main/java/jp/naist/se/stigmata/event/{OperationEvent.java => BirthmarkEngineEvent.java} (67%) create mode 100755 src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineListener.java delete mode 100755 src/main/java/jp/naist/se/stigmata/event/OperationAdapter.java delete mode 100755 src/main/java/jp/naist/se/stigmata/event/OperationListener.java diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkElementClassNotFoundException.java b/src/main/java/jp/naist/se/stigmata/BirthmarkElementClassNotFoundException.java index 7ca894b..a957a0b 100644 --- a/src/main/java/jp/naist/se/stigmata/BirthmarkElementClassNotFoundException.java +++ b/src/main/java/jp/naist/se/stigmata/BirthmarkElementClassNotFoundException.java @@ -12,7 +12,7 @@ import java.util.List; * @version $Revision$ $Date$ */ public class BirthmarkElementClassNotFoundException extends - BirthmarkExtractionException { + BirthmarkExtractionFailedException { private static final long serialVersionUID = 3256723476854L; private List classnames = new ArrayList(); diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkExtractionException.java b/src/main/java/jp/naist/se/stigmata/BirthmarkExtractionFailedException.java similarity index 70% rename from src/main/java/jp/naist/se/stigmata/BirthmarkExtractionException.java rename to src/main/java/jp/naist/se/stigmata/BirthmarkExtractionFailedException.java index 7384d37..2dc543b 100644 --- a/src/main/java/jp/naist/se/stigmata/BirthmarkExtractionException.java +++ b/src/main/java/jp/naist/se/stigmata/BirthmarkExtractionFailedException.java @@ -11,24 +11,24 @@ import java.util.List; * @author Haruaki TAMADA * @version $Revision$ $Date$ */ -public class BirthmarkExtractionException extends Exception { +public class BirthmarkExtractionFailedException extends Exception { private static final long serialVersionUID = 21932436457235L; private List causes = new ArrayList(); - public BirthmarkExtractionException() { + public BirthmarkExtractionFailedException() { super(); } - public BirthmarkExtractionException(String arg0, Throwable cause) { + public BirthmarkExtractionFailedException(String arg0, Throwable cause) { super(arg0, cause); } - public BirthmarkExtractionException(String arg0) { + public BirthmarkExtractionFailedException(String arg0) { super(arg0); } - public BirthmarkExtractionException(Throwable cause) { + public BirthmarkExtractionFailedException(Throwable cause) { super(cause); } diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java index 364e782..5a26686 100644 --- a/src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java +++ b/src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java @@ -38,40 +38,40 @@ public interface BirthmarkExtractor{ /** * extract birthmark from given stream. */ - public Birthmark extract(InputStream in) throws BirthmarkExtractionException; + public Birthmark extract(InputStream in) throws BirthmarkExtractionFailedException; /** * extract birthmark from given byte array. */ - public Birthmark extract(byte[] bytecode) throws BirthmarkExtractionException; + public Birthmark extract(byte[] bytecode) throws BirthmarkExtractionFailedException; /** * extract birthmark from given stream with given context. */ - public Birthmark extract(InputStream in, BirthmarkContext context) throws BirthmarkExtractionException; + public Birthmark extract(InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException; /** * extract birthmark from given byte array with given context. */ - public Birthmark extract(byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionException; + public Birthmark extract(byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException; /** * extract birthmark from given stream and add element to given birthmark object. */ - public Birthmark extract(Birthmark birthmark, InputStream in) throws BirthmarkExtractionException; + public Birthmark extract(Birthmark birthmark, InputStream in) throws BirthmarkExtractionFailedException; /** * extract birthmark from given byte array and add element to given birthmark object. */ - public Birthmark extract(Birthmark birthmark, byte[] bytecode) throws BirthmarkExtractionException; + public Birthmark extract(Birthmark birthmark, byte[] bytecode) throws BirthmarkExtractionFailedException; /** * extract birthmark from given stream with given context and add element to given birthmark object. */ - public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionException; + public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException; /** * extract birthmark from given byte array with given context and add element to given birthmark object. */ - public Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionException; + public Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException; } diff --git a/src/main/java/jp/naist/se/stigmata/Stigmata.java b/src/main/java/jp/naist/se/stigmata/Stigmata.java index cbb523e..20ed8de 100644 --- a/src/main/java/jp/naist/se/stigmata/Stigmata.java +++ b/src/main/java/jp/naist/se/stigmata/Stigmata.java @@ -23,8 +23,8 @@ import java.util.logging.Logger; import javax.imageio.spi.ServiceRegistry; -import jp.naist.se.stigmata.event.OperationEvent; -import jp.naist.se.stigmata.event.OperationListener; +import jp.naist.se.stigmata.event.BirthmarkEngineEvent; +import jp.naist.se.stigmata.event.BirthmarkEngineListener; import jp.naist.se.stigmata.event.OperationStage; import jp.naist.se.stigmata.event.OperationType; import jp.naist.se.stigmata.event.WarningMessages; @@ -54,7 +54,7 @@ public final class Stigmata{ private boolean configDone = false; private Stack stack = new Stack(); private WarningMessages warnings; - private List listeners = new ArrayList(); + private List listeners = new ArrayList(); private Stigmata(){ } @@ -63,11 +63,11 @@ public final class Stigmata{ return instance; } - public void addOperationListener(OperationListener listener){ + public void addOperationListener(BirthmarkEngineListener listener){ listeners.add(listener); } - public void removeOperationListener(OperationListener listener){ + public void removeOperationListener(BirthmarkEngineListener listener){ listeners.remove(listener); } @@ -124,7 +124,7 @@ public final class Stigmata{ return context; } - public BirthmarkSet[] extract(String[] birthmarks, String[] files) throws BirthmarkExtractionException{ + public BirthmarkSet[] extract(String[] birthmarks, String[] files) throws BirthmarkExtractionFailedException{ operationStart(OperationType.EXTRACT_BIRTHMARKS); BirthmarkSet[] set = extract(birthmarks, files, createContext()); operationDone(OperationType.EXTRACT_BIRTHMARKS); @@ -133,12 +133,12 @@ public final class Stigmata{ } public BirthmarkSet[] extract(String[] birthmarks, String[] files, - BirthmarkContext context) throws BirthmarkExtractionException{ + BirthmarkContext context) throws BirthmarkExtractionFailedException{ operationStart(OperationType.EXTRACT_BIRTHMARKS); try{ return extractImpl(birthmarks, files, context); } catch(IOException e){ - throw new BirthmarkExtractionException(e); + throw new BirthmarkExtractionFailedException(e); } finally{ operationDone(OperationType.EXTRACT_BIRTHMARKS); } @@ -327,23 +327,23 @@ public final class Stigmata{ } if(warnings == null){ warnings = new WarningMessages(type); - fireEvent(new OperationEvent(OperationStage.OPERATION_START, type, warnings)); + fireEvent(new BirthmarkEngineEvent(OperationStage.OPERATION_START, type, warnings)); } stack.push(warnings); - fireEvent(new OperationEvent(OperationStage.SUB_OPERATION_START, type, warnings)); + fireEvent(new BirthmarkEngineEvent(OperationStage.SUB_OPERATION_START, type, warnings)); } private void operationDone(OperationType type){ - fireEvent(new OperationEvent(OperationStage.SUB_OPERATION_DONE, type, warnings)); + fireEvent(new BirthmarkEngineEvent(OperationStage.SUB_OPERATION_DONE, type, warnings)); stack.pop(); if(stack.size() == 0){ - fireEvent(new OperationEvent(OperationStage.OPERATION_DONE, type, warnings)); + fireEvent(new BirthmarkEngineEvent(OperationStage.OPERATION_DONE, type, warnings)); warnings = null; } } - private void fireEvent(OperationEvent e){ - for(OperationListener listener: listeners){ + private void fireEvent(BirthmarkEngineEvent e){ + for(BirthmarkEngineListener listener: listeners){ switch(e.getStage()){ case OPERATION_START: listener.operationStart(e); @@ -363,7 +363,7 @@ public final class Stigmata{ } } - private BirthmarkSet[] extractImpl(String[] birthmarks, String[] files, BirthmarkContext context) throws IOException, BirthmarkExtractionException{ + private BirthmarkSet[] extractImpl(String[] birthmarks, String[] files, BirthmarkContext context) throws IOException, BirthmarkExtractionFailedException{ ClassFileArchive[] archives = createArchives(files, context); BirthmarkExtractor[] extractors = createExtractors(birthmarks, context); ExtractionUnit unit = context.getExtractionUnit(); @@ -380,7 +380,7 @@ public final class Stigmata{ return null; } - private BirthmarkSet[] extractFromPackage(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionException{ + private BirthmarkSet[] extractFromPackage(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionFailedException{ Map list = new HashMap(); for(ClassFileArchive archive: archives){ @@ -424,7 +424,7 @@ public final class Stigmata{ return n; } - private BirthmarkSet[] extractFromClass(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionException{ + private BirthmarkSet[] extractFromClass(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionFailedException{ List list = new ArrayList(); for(ClassFileArchive archive: archives){ @@ -447,7 +447,7 @@ public final class Stigmata{ return list.toArray(new BirthmarkSet[list.size()]); } - private BirthmarkSet[] extractFromProduct(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionException{ + private BirthmarkSet[] extractFromProduct(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionFailedException{ List list = new ArrayList(); for(ClassFileArchive archive: archives){ diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java index 2c25d4d..319c4bc 100644 --- a/src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java +++ b/src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java @@ -9,7 +9,7 @@ import java.io.InputStream; import jp.naist.se.stigmata.Birthmark; import jp.naist.se.stigmata.BirthmarkContext; -import jp.naist.se.stigmata.BirthmarkExtractionException; +import jp.naist.se.stigmata.BirthmarkExtractionFailedException; import jp.naist.se.stigmata.spi.BirthmarkSpi; import org.objectweb.asm.ClassReader; @@ -36,8 +36,8 @@ public abstract class ASMBirthmarkExtractor extends AbstractBirthmarkExtractor{ @Override public Birthmark extract(Birthmark birthmark, InputStream in, - BirthmarkContext context) throws BirthmarkExtractionException{ - BirthmarkExtractionException bee = new BirthmarkExtractionException(); + BirthmarkContext context) throws BirthmarkExtractionFailedException{ + BirthmarkExtractionFailedException bee = new BirthmarkExtractionFailedException(); try{ ClassReader reader = new ClassReader(in); diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java index f9c6b6e..3d06e13 100644 --- a/src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java +++ b/src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java @@ -9,7 +9,7 @@ import java.io.InputStream; import jp.naist.se.stigmata.Birthmark; import jp.naist.se.stigmata.BirthmarkContext; -import jp.naist.se.stigmata.BirthmarkExtractionException; +import jp.naist.se.stigmata.BirthmarkExtractionFailedException; import jp.naist.se.stigmata.BirthmarkExtractor; import jp.naist.se.stigmata.ExtractionUnit; import jp.naist.se.stigmata.spi.BirthmarkSpi; @@ -50,56 +50,56 @@ public abstract class AbstractBirthmarkExtractor implements BirthmarkExtractor{ /** * extract birthmark given stream. */ - public final Birthmark extract(InputStream in) throws BirthmarkExtractionException{ + public final Birthmark extract(InputStream in) throws BirthmarkExtractionFailedException{ return extract(in, BirthmarkContext.getDefaultContext()); } /** * extract birthmark given byte array. */ - public final Birthmark extract(byte[] bytecode) throws BirthmarkExtractionException{ + public final Birthmark extract(byte[] bytecode) throws BirthmarkExtractionFailedException{ return extract(bytecode, BirthmarkContext.getDefaultContext()); } /** * extract birthmark given stream. */ - public final Birthmark extract(Birthmark birthmark, InputStream in) throws BirthmarkExtractionException{ + public final Birthmark extract(Birthmark birthmark, InputStream in) throws BirthmarkExtractionFailedException{ return extract(birthmark, in, BirthmarkContext.getDefaultContext()); } /** * extract birthmark given byte array. */ - public final Birthmark extract(Birthmark birthmark, byte[] bytecode) throws BirthmarkExtractionException{ + public final Birthmark extract(Birthmark birthmark, byte[] bytecode) throws BirthmarkExtractionFailedException{ return extract(birthmark, bytecode, BirthmarkContext.getDefaultContext()); } /** * extract birthmark given stream with given context. */ - public final Birthmark extract(InputStream in, BirthmarkContext context) throws BirthmarkExtractionException{ + public final Birthmark extract(InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException{ return extract(createBirthmark(), in, context); } /** * extract birthmark given byte array with given context. */ - public final Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionException{ + public final Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException{ return extract(birthmark, new ByteArrayInputStream(bytecode), context); } /** * extract birthmark given byte array with given context. */ - public final Birthmark extract(byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionException{ + public final Birthmark extract(byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException{ return extract(createBirthmark(), new ByteArrayInputStream(bytecode), context); } /** * extract birthmark given stream with given context. */ - public abstract Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionException; + public abstract Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException; /** * create birthmark. diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java index de4bfbd..6d8ddd8 100644 --- a/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java +++ b/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java @@ -10,7 +10,7 @@ import java.io.InputStream; import jp.naist.se.stigmata.Birthmark; import jp.naist.se.stigmata.BirthmarkContext; import jp.naist.se.stigmata.BirthmarkElementClassNotFoundException; -import jp.naist.se.stigmata.BirthmarkExtractionException; +import jp.naist.se.stigmata.BirthmarkExtractionFailedException; import jp.naist.se.stigmata.ExtractionUnit; import jp.naist.se.stigmata.birthmarks.AbstractBirthmarkExtractor; import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor; @@ -36,7 +36,7 @@ public class InheritanceStructureBirthmarkExtractor extends AbstractBirthmarkExt } @Override - public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionException{ + public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException{ BirthmarkElementClassNotFoundException e = new BirthmarkElementClassNotFoundException(); try{ diff --git a/src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineAdapter.java b/src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineAdapter.java new file mode 100755 index 0000000..530dd35 --- /dev/null +++ b/src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineAdapter.java @@ -0,0 +1,24 @@ +package jp.naist.se.stigmata.event; + +/* + * $Id$ + */ + +/** + * @author Haruaki Tamada + * @version $Revision$ $Date$ + */ +public class BirthmarkEngineAdapter implements BirthmarkEngineListener{ + + public void operationDone(BirthmarkEngineEvent e){ + } + + public void operationStart(BirthmarkEngineEvent e){ + } + + public void subOperationDone(BirthmarkEngineEvent e){ + } + + public void subOperationStart(BirthmarkEngineEvent e){ + } +} diff --git a/src/main/java/jp/naist/se/stigmata/event/OperationEvent.java b/src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineEvent.java similarity index 67% rename from src/main/java/jp/naist/se/stigmata/event/OperationEvent.java rename to src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineEvent.java index 2d78180..37c0869 100755 --- a/src/main/java/jp/naist/se/stigmata/event/OperationEvent.java +++ b/src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineEvent.java @@ -1,15 +1,24 @@ package jp.naist.se.stigmata.event; +/* + * $Id$ + */ + import java.util.EventObject; -public class OperationEvent extends EventObject{ +/** + * + * @author Haruaki Tamada + * @version $Revision$ $Date$ + */ +public class BirthmarkEngineEvent extends EventObject{ private static final long serialVersionUID = -1260793588721638917L; private OperationType type; private OperationStage stage; private WarningMessages message; - public OperationEvent(OperationStage stage, OperationType type, WarningMessages message){ + public BirthmarkEngineEvent(OperationStage stage, OperationType type, WarningMessages message){ super(type.ordinal()); this.type = type; this.stage = stage; diff --git a/src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineListener.java b/src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineListener.java new file mode 100755 index 0000000..b5ad51e --- /dev/null +++ b/src/main/java/jp/naist/se/stigmata/event/BirthmarkEngineListener.java @@ -0,0 +1,22 @@ +package jp.naist.se.stigmata.event; + +/* + * $Id$ + */ + +import java.util.EventListener; + +/** + * + * @author Haruaki Tamada + * @version $Revision$ $Date$ + */ +public interface BirthmarkEngineListener extends EventListener{ + public void operationStart(BirthmarkEngineEvent e); + + public void subOperationStart(BirthmarkEngineEvent e); + + public void subOperationDone(BirthmarkEngineEvent e); + + public void operationDone(BirthmarkEngineEvent e); +} diff --git a/src/main/java/jp/naist/se/stigmata/event/OperationAdapter.java b/src/main/java/jp/naist/se/stigmata/event/OperationAdapter.java deleted file mode 100755 index b809031..0000000 --- a/src/main/java/jp/naist/se/stigmata/event/OperationAdapter.java +++ /dev/null @@ -1,24 +0,0 @@ -package jp.naist.se.stigmata.event; - -/* - * $Id$ - */ - -/** - * @author Haruaki Tamada - * @version $Revision$ $Date$ - */ -public class OperationAdapter implements OperationListener{ - - public void operationDone(OperationEvent e){ - } - - public void operationStart(OperationEvent e){ - } - - public void subOperationDone(OperationEvent e){ - } - - public void subOperationStart(OperationEvent e){ - } -} diff --git a/src/main/java/jp/naist/se/stigmata/event/OperationListener.java b/src/main/java/jp/naist/se/stigmata/event/OperationListener.java deleted file mode 100755 index 954f5b6..0000000 --- a/src/main/java/jp/naist/se/stigmata/event/OperationListener.java +++ /dev/null @@ -1,13 +0,0 @@ -package jp.naist.se.stigmata.event; - -import java.util.EventListener; - -public interface OperationListener extends EventListener{ - public void operationStart(OperationEvent e); - - public void subOperationStart(OperationEvent e); - - public void subOperationDone(OperationEvent e); - - public void operationDone(OperationEvent e); -} diff --git a/src/main/java/jp/naist/se/stigmata/event/OperationType.java b/src/main/java/jp/naist/se/stigmata/event/OperationType.java index 17abb2f..afdfb90 100755 --- a/src/main/java/jp/naist/se/stigmata/event/OperationType.java +++ b/src/main/java/jp/naist/se/stigmata/event/OperationType.java @@ -1,5 +1,14 @@ package jp.naist.se.stigmata.event; +/* + * $Id$ + */ + +/** + * + * @author Haruaki Tamada + * @version $Revision$ $Date$ + */ public enum OperationType{ CONFIGURATION, EXTRACT_BIRTHMARKS, diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java index 1743836..a493aaa 100644 --- a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java +++ b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java @@ -40,15 +40,15 @@ import javax.swing.filechooser.FileFilter; import jp.naist.se.stigmata.BirthmarkContext; import jp.naist.se.stigmata.BirthmarkElementClassNotFoundException; -import jp.naist.se.stigmata.BirthmarkExtractionException; +import jp.naist.se.stigmata.BirthmarkExtractionFailedException; import jp.naist.se.stigmata.BirthmarkSet; import jp.naist.se.stigmata.CertainPairComparisonResultSet; import jp.naist.se.stigmata.ComparisonPair; import jp.naist.se.stigmata.ComparisonPairFilterSet; import jp.naist.se.stigmata.ComparisonResultSet; import jp.naist.se.stigmata.Stigmata; -import jp.naist.se.stigmata.event.OperationAdapter; -import jp.naist.se.stigmata.event.OperationEvent; +import jp.naist.se.stigmata.event.BirthmarkEngineAdapter; +import jp.naist.se.stigmata.event.BirthmarkEngineEvent; import jp.naist.se.stigmata.event.WarningMessages; import jp.naist.se.stigmata.filter.FilteredComparisonResultSet; import jp.naist.se.stigmata.ui.swing.actions.AboutAction; @@ -88,9 +88,9 @@ public class StigmataFrame extends JFrame{ this.context = context; this.fileio = new FileIOManager(this); - stigmata.addOperationListener(new OperationAdapter(){ + stigmata.addOperationListener(new BirthmarkEngineAdapter(){ @Override - public void operationDone(OperationEvent e){ + public void operationDone(BirthmarkEngineEvent e){ showWarnings(e.getMessage()); } }); @@ -524,9 +524,9 @@ public class StigmataFrame extends JFrame{ StringWriter writer = new StringWriter(); PrintWriter out = new PrintWriter(writer); e.printStackTrace(out); - if(e instanceof BirthmarkExtractionException){ + if(e instanceof BirthmarkExtractionFailedException){ out.println("Causes:"); - for(Throwable t: ((BirthmarkExtractionException)e).getCauses()){ + for(Throwable t: ((BirthmarkExtractionFailedException)e).getCauses()){ t.printStackTrace(out); } } -- 2.11.0