Adding the output of unfixes and safe prefixes to the PrefixView.

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/extractors/ExtractAndMoveMethodPrefixesExtractor.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/extractors/ExtractAndMoveMethodPrefixesExtractor.java
index 18a9f649fb79345f9f563cf9c637d6ff74d402bf..cb4d691a05d8652e3553b964dcb82837b4a3db4e 100644 (file)
--- a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/extractors/ExtractAndMoveMethodPrefixesExtractor.java
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/extractors/ExtractAndMoveMethodPrefixesExtractor.java
@@ -25,8 +25,8 @@ import org.eclipse.jdt.core.ICompilationUnit;
  */
 public class ExtractAndMoveMethodPrefixesExtractor extends PropertyExtractor {
 
-       private PrefixesCollector prefixesCollector;
-       private UnfixesCollector unfixesCollector;
+       protected final PrefixesCollector prefixesCollector;
+       protected final UnfixesCollector unfixesCollector;
        private PrefixSet safePrefixes = null;
 
        public ExtractAndMoveMethodPrefixesExtractor(SmartTextSelection selection, ICompilationUnit icu) {
@@ -55,4 +55,12 @@ public class ExtractAndMoveMethodPrefixesExtractor extends PropertyExtractor {
        public boolean hasUsefulResults() {
                return !getSafePrefixes().isEmpty();
        }
+       
+       protected PrefixSet getPrefixes() {
+               return prefixesCollector.getPrefixes();
+       }
+
+       protected PrefixSet getUnfixes() {
+               return unfixesCollector.getUnfixes();
+       }
 }

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/extractors/PrefixViewExtractor.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/extractors/PrefixViewExtractor.java
new file mode 100644 (file)
index 0000000..0c88c2f
--- /dev/null
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/extractors/PrefixViewExtractor.java
@@ -0,0 +1,20 @@
+package no.uio.ifi.refaktor.extractors;
+
+import no.uio.ifi.refaktor.utils.SmartTextSelection;
+
+public class PrefixViewExtractor extends ExtractAndMoveMethodPrefixesExtractor {
+
+       public PrefixViewExtractor(SmartTextSelection selection) {
+               super(selection, null);
+       }
+       
+       @Override
+       public String toString() {
+               assert selectionIsValid();
+               assert isExtracted;
+               String str = "Prefixes:\n" + getPrefixes().toString();
+               str += "\nUnfixes:\n" + getUnfixes().toString();
+               str += "\nSafe Prefixes:\n" + getSafePrefixes().toString();
+               return str;
+       }
+}

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/views/PrefixView.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/views/PrefixView.java
index 175855576f8d94589e6a0ee3139d909257126bcd..a80f90c81f86e4f8fbf07323ca58990158352e60 100644 (file)
--- a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/views/PrefixView.java
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/views/PrefixView.java
@@ -1,7 +1,7 @@
 package no.uio.ifi.refaktor.views;
 
 
-import no.uio.ifi.refaktor.extractors.PrefixesExtractor;
+import no.uio.ifi.refaktor.extractors.PrefixViewExtractor;
 import no.uio.ifi.refaktor.utils.DocumentUtils;
 import no.uio.ifi.refaktor.utils.ParseUtils;
 import no.uio.ifi.refaktor.utils.SmartTextSelection;
@@ -116,7 +116,7 @@ public class PrefixView extends ViewPart implements ISelectionChangedListener, I
                        return;
                }
                SmartTextSelection smartTextSelection = new SmartTextSelection(document, strippedTextSelection);
-               final PrefixesExtractor extractor = new PrefixesExtractor(smartTextSelection);
+               final PrefixViewExtractor extractor = new PrefixViewExtractor(smartTextSelection);
                if (extractor.selectionIsValid()) {
                        extractor.extractProperty();
                        String dialogText = extractor.toString();