rename RectangleExecution to RectangleStorage

diff --git a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/KillRectangleExecution.java b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/KillRectangleExecution.java
index ac81e69..50516a5 100644 (file)
--- a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/KillRectangleExecution.java
+++ b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/KillRectangleExecution.java
@@ -14,7 +14,7 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;\r
 import org.eclipse.jface.text.ITextSelection;\r
 \r
-public final class KillRectangleExecution extends RectangleExecution {\r
+public final class KillRectangleExecution extends TextEditorExecution {\r
 \r
     @Override\r
     public void execute() throws BadLocationException {\r
@@ -43,7 +43,7 @@ public final class KillRectangleExecution extends RectangleExecution {
         transaction.begin(DocumentRewriteSessionType.UNRESTRICTED_SMALL);\r
         try {\r
             List<String> rectangle = killRectangle(doc, startRow, startColumn, endRow, endColumn);\r
-            setRectangle(rectangle);\r
+            RectangleStorage.setRectangle(rectangle);\r
         } finally {\r
             transaction.end();\r
         }\r

diff --git a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/RectangleExecution.java b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/RectangleExecution.java
deleted file mode 100644 (file)
index e49ce60..0000000
--- a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/RectangleExecution.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package jp.sourceforge.moreemacs.handlers;\r
-\r
-import java.util.List;\r
-\r
-abstract class RectangleExecution extends TextEditorExecution {\r
-    private static List<String> rectangle ;\r
-    \r
-    protected static void setRectangle(List<String> rect) {\r
-        rectangle = rect;\r
-    }\r
-    \r
-    protected static List<String> getRectangle() {\r
-        return rectangle;\r
-    }\r
-}\r

diff --git a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/RectangleStorage.java b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/RectangleStorage.java
new file mode 100644 (file)
index 0000000..cdca590
--- /dev/null
+++ b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/RectangleStorage.java
@@ -0,0 +1,17 @@
+package jp.sourceforge.moreemacs.handlers;\r
+\r
+import java.util.List;\r
+\r
+final class RectangleStorage {\r
+    private static List<String> rectangle ;\r
+    \r
+    private RectangleStorage() {}\r
+    \r
+    static void setRectangle(List<String> rect) {\r
+        rectangle = rect;\r
+    }\r
+    \r
+    static List<String> getRectangle() {\r
+        return rectangle;\r
+    }\r
+}\r

diff --git a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/YankRectangleExecution.java b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/YankRectangleExecution.java
index f570c0f..c89620a 100644 (file)
--- a/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/YankRectangleExecution.java
+++ b/jp.sourceforge.moreemacs/src/jp/sourceforge/moreemacs/handlers/YankRectangleExecution.java
@@ -13,14 +13,14 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;\r
 import org.eclipse.jface.text.TextUtilities;\r
 \r
-public final class YankRectangleExecution extends RectangleExecution {\r
+public final class YankRectangleExecution extends TextEditorExecution {\r
     @Override\r
     public void execute() throws BadLocationException {\r
         if(!textEditor.isEditable()) {\r
             return;\r
         }\r
         \r
-        List<String> rectangle = getRectangle();\r
+        List<String> rectangle = RectangleStorage.getRectangle();\r
         if(rectangle == null) {\r
             return;\r
         }\r