OSDN Git Service

organize method names in class ExtractionResultSet
authortama3 <tama3@acee48c3-7b26-0410-bdac-b3d0e5314bbc>
Fri, 26 Oct 2007 01:31:44 +0000 (01:31 +0000)
committertama3 <tama3@acee48c3-7b26-0410-bdac-b3d0e5314bbc>
Fri, 26 Oct 2007 01:31:44 +0000 (01:31 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@254 acee48c3-7b26-0410-bdac-b3d0e5314bbc

src/main/java/jp/naist/se/stigmata/result/AbstractExtractionResultSet.java
src/main/java/jp/naist/se/stigmata/result/MemoryExtractedBirthmarkService.java
src/main/java/jp/naist/se/stigmata/result/XmlFileExtractedBirthmarkService.java
src/main/java/jp/naist/se/stigmata/result/XmlFileExtractionResultSet.java
src/main/java/jp/naist/se/stigmata/result/history/ExtractedBirthmarkHistory.java
src/main/java/jp/naist/se/stigmata/result/history/MemoryExtractedBirthmarkHistory.java
src/main/java/jp/naist/se/stigmata/result/history/RDBExtractedBirthmarkHistory.java
src/main/java/jp/naist/se/stigmata/result/history/XmlFileExtractedBirthmarkHistory.java
src/main/java/jp/naist/se/stigmata/ui/swing/ExtractedHistoryPane.java

index 7b15e58..dadcbdb 100755 (executable)
@@ -194,7 +194,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet
         this.tableType = flag;\r
     }\r
 \r
-    protected String generateId(){\r
+    protected static String generateId(){\r
         SimpleDateFormat cdf = new SimpleDateFormat("yyyyMMdd-HHmmss.SSS");\r
         return cdf.format(Calendar.getInstance().getTime());\r
     }\r
index 753f6a7..58f054e 100755 (executable)
@@ -30,7 +30,7 @@ public class MemoryExtractedBirthmarkService implements ExtractedBirthmarkSpi{
     }\r
 \r
     public ExtractionResultSet getResultSet(String id){\r
-        return history.getExtractionResultSet(id);\r
+        return history.getResultSet(id);\r
     }\r
 \r
     public BirthmarkStoreTarget getTarget(){\r
index f59490e..a46066b 100755 (executable)
@@ -34,7 +34,9 @@ public class XmlFileExtractedBirthmarkService implements ExtractedBirthmarkSpi{
     }\r
 \r
     public ExtractionResultSet createResultSet(BirthmarkContext context, File base){\r
-        return new XmlFileExtractionResultSet(context, base);\r
+        return new XmlFileExtractionResultSet(\r
+            context, new File(base, AbstractExtractionResultSet.generateId())\r
+        );\r
     }\r
 \r
     public ExtractedBirthmarkHistory getHistory(String parameter){\r
index a758c5b..670c41a 100755 (executable)
@@ -52,16 +52,16 @@ import jp.naist.se.stigmata.utils.MultipleIterator;
  */
 public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{
     private boolean addmode = true;
-    private File baseDirectory;
+    private File storeDirectory;
     private Map<ExtractionTarget, XmlFile> files = new HashMap<ExtractionTarget, XmlFile>();
 
     XmlFileExtractionResultSet(BirthmarkContext context){
         super(context);
     }
 
-    XmlFileExtractionResultSet(BirthmarkContext context, File baseDirectory){
+    XmlFileExtractionResultSet(BirthmarkContext context, File storeDirectory){
         super(context);
-        this.baseDirectory = baseDirectory;
+        this.storeDirectory = storeDirectory;
     }
 
     public XmlFileExtractionResultSet(BirthmarkContext context, boolean tableType){
@@ -72,7 +72,7 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{
         super(Stigmata.getInstance().createContext());
 
         addmode = false;
-        baseDirectory = directory;
+        storeDirectory = directory;
 
         BirthmarkContext context = getContext();
         context.setStoreTarget(BirthmarkStoreTarget.XMLFILE);
@@ -84,7 +84,7 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{
             context.setComparisonMethod(ComparisonMethod.ROUND_ROBIN_SAME_PAIR);
         }
 
-        for(File file: baseDirectory.listFiles(new ExtensionFilter("xml"))){
+        for(File file: storeDirectory.listFiles(new ExtensionFilter("xml"))){
             String fileName = file.getName();
             String name = fileName.substring(0, fileName.lastIndexOf('.'));
             ExtractionTarget et = ExtractionTarget.valueOf(name);
@@ -102,7 +102,7 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{
             }
             XmlFile xml = files.get(target);
             if(xml == null){
-                xml = new XmlFile(new File(getBaseDirectory(), target.name() + ".xml"), getContext());
+                xml = new XmlFile(new File(getStoreDirectory(), target.name() + ".xml"), getContext());
                 files.put(target, xml);
             }
             xml.addBirthmarkSet(set);
@@ -193,14 +193,14 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{
         }
     }
 
-    private File getBaseDirectory(){
-        if(baseDirectory == null){
-            baseDirectory = new File(BirthmarkEnvironment.getStigmataHome(), "extracted_birthmarks/" + generateId());
-            if(!baseDirectory.exists()){
-                baseDirectory.mkdirs();
-            }
+    private File getStoreDirectory(){
+        if(storeDirectory == null){
+            storeDirectory = new File(BirthmarkEnvironment.getStigmataHome(), "extracted_birthmarks/" + generateId());
+        }
+        if(!storeDirectory.exists()){
+            storeDirectory.mkdirs();
         }
-        return baseDirectory;
+        return storeDirectory;
     }
 
     private void closeAllStream(){
index 1cce032..fdec766 100755 (executable)
@@ -9,6 +9,7 @@ import java.util.Iterator;
 import jp.naist.se.stigmata.ExtractionResultSet;
 
 /**
+ * This interface indicates extracted history management.
  * 
  * @author Haruaki Tamada
  * @version $Revision$ $Date$
@@ -22,22 +23,22 @@ public interface ExtractedBirthmarkHistory extends Iterable<String>{
     /**
      * returns an array of history ids.
      */
-    public String[] getIds();
+    public String[] getResultSetIds();
 
     /**
      * returns an extraction result set corresponding id.
      */
-    public ExtractionResultSet getExtractionResultSet(String id);
+    public ExtractionResultSet getResultSet(String id);
 
     /**
      * deletes all histories this instance is managed.
      */
-    public void deleteAll();
+    public void deleteAllResultSets();
 
     /**
      * deletes an extraction result set corresponding id.
      */
-    public void delete(String id);
+    public void deleteResultSet(String id);
 
     /**
      * refreshes histories.
index 04d1c5b..e97bd94 100755 (executable)
@@ -24,19 +24,19 @@ public class MemoryExtractedBirthmarkHistory implements ExtractedBirthmarkHistor
         map.put(mers.getId(), mers);\r
     }\r
 \r
-    public void delete(String id){\r
+    public void deleteResultSet(String id){\r
         map.remove(id);\r
     }\r
 \r
-    public void deleteAll(){\r
+    public void deleteAllResultSets(){\r
         map.clear();\r
     }\r
 \r
-    public ExtractionResultSet getExtractionResultSet(String id){\r
+    public ExtractionResultSet getResultSet(String id){\r
         return map.get(id);\r
     }\r
 \r
-    public synchronized String[] getIds(){\r
+    public synchronized String[] getResultSetIds(){\r
         return map.keySet().toArray(new String[map.size()]);\r
     }\r
 \r
index 4c0d000..5c71460 100755 (executable)
@@ -28,7 +28,7 @@ public class RDBExtractedBirthmarkHistory implements ExtractedBirthmarkHistory{
         this.source = source;
     }
 
-    public void delete(String id){
+    public void deleteResultSet(String id){
         QueryRunner runner = new QueryRunner(source);
 
         try{
@@ -39,7 +39,7 @@ public class RDBExtractedBirthmarkHistory implements ExtractedBirthmarkHistory{
         }
     }
 
-    public void deleteAll(){
+    public void deleteAllResultSets(){
         QueryRunner runner = new QueryRunner(source);
         try{
             runner.update("DELETE FROM EXTRACTED_BIRTHMARK_TYPES");
@@ -49,11 +49,11 @@ public class RDBExtractedBirthmarkHistory implements ExtractedBirthmarkHistory{
         }
     }
 
-    public ExtractionResultSet getExtractionResultSet(String id){
+    public ExtractionResultSet getResultSet(String id){
         return new RDBExtractionResultSet(source, id);
     }
 
-    public String[] getIds(){
+    public String[] getResultSetIds(){
         QueryRunner runner = new QueryRunner(source);
         try{
             String[] ids = (String[])runner.query(
@@ -66,7 +66,7 @@ public class RDBExtractedBirthmarkHistory implements ExtractedBirthmarkHistory{
     }
 
     public Iterator<String> iterator(){
-        return new ArrayIterator<String>(getIds());
+        return new ArrayIterator<String>(getResultSetIds());
     }
 
     public void refresh(){
index b1f9907..99898bd 100755 (executable)
@@ -47,7 +47,7 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto
         }
     }
 
-    public void deleteAll(){
+    public void deleteAllResultSets(){
         for(File file: parent.listFiles()){
             if(isTarget(file)){
                 Utility.deleteDirectory(file);
@@ -55,7 +55,7 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto
         }
     }
 
-    public void delete(String id){
+    public void deleteResultSet(String id){
         File file = files.get(id);
         if(file != null){
             if(file.isDirectory()){
@@ -67,7 +67,7 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto
         }
     }
 
-    public ExtractionResultSet getExtractionResultSet(String id){
+    public ExtractionResultSet getResultSet(String id){
         File file = files.get(id);
         if(file != null){
             return new XmlFileExtractionResultSet(file);
@@ -75,7 +75,7 @@ public class XmlFileExtractedBirthmarkHistory implements ExtractedBirthmarkHisto
         return null;
     }
 
-    public synchronized String[] getIds(){
+    public synchronized String[] getResultSetIds(){
         return files.keySet().toArray(new String[files.size()]);
     }
 
index 88e9690..034a998 100755 (executable)
@@ -57,7 +57,6 @@ public class ExtractedHistoryPane extends JPanel{
         currentHistory = historyManager.getHistory(historyId);
         model.clear();
 
-        System.out.println(historyId);
         for(String id: currentHistory){
             model.addElement(id);
         }
@@ -72,7 +71,7 @@ public class ExtractedHistoryPane extends JPanel{
     }
 
     private void showAction(String id){
-        ExtractionResultSet ers = currentHistory.getExtractionResultSet(id);
+        ExtractionResultSet ers = currentHistory.getResultSet(id);
         stigmata.showExtractionResult(ers);
     }
 
@@ -100,7 +99,7 @@ public class ExtractedHistoryPane extends JPanel{
                 int[] indeces = list.getSelectedIndices();
                 for(int i = indeces.length - 1; i >= 0; i--){
                     String id = (String)model.get(indeces[i]);
-                    currentHistory.delete(id);
+                    currentHistory.deleteResultSet(id);
                     model.remove(indeces[i]);
                 }
                 list.clearSelection();
@@ -117,6 +116,7 @@ public class ExtractedHistoryPane extends JPanel{
         JButton refreshButton = GUIUtility.createButton("refreshhistory", refreshAction);
         JButton deleteButton = GUIUtility.createButton("deletehistory", deleteAction);
         deleteAction.setEnabled(false);
+        showAction.setEnabled(false);
 
         list.getSelectionModel().addListSelectionListener(new ListSelectionListener(){
             public void valueChanged(ListSelectionEvent e){