svn commit: r1158675 - in /cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler: editor/SQLTemplateScriptsTab.java editor/SQLTemplateTabbedView.java undo/TextCompoundEdit.java

[dk...@apache.org]

Author: dkazimirchyk
Date: Wed Aug 17 12:50:31 2011
New Revision: 1158675

URL: http://svn.apache.org/viewvc?rev=1158675&view=rev
Log:
CAY-1591 CayenneModeler: keyboard shortcuts causing havoc in SQLTemplate SQL editor

fixing bug with invalid SQLTemplate selection during undo, redo actions

Modified:
    cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
    cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
    cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java

Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java?rev=1158675&r1=1158674&r2=1158675&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java Wed Aug 17 12:50:31 2011
@@ -345,4 +345,12 @@ public class SQLTemplateScriptsTab exten
             return c;
         }
     }
+    
+    public int getSelectedIndex() {
+        return scripts.getSelectedIndex();
+    }
+    
+    public void setSelectedIndex(int index) {
+        scripts.setSelectedIndex(index);
+    }
 }

Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java?rev=1158675&r1=1158674&r2=1158675&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java Wed Aug 17 12:50:31 2011
@@ -106,4 +106,8 @@ public class SQLTemplateTabbedView exten
                 break;
         }
     }
+
+    public SQLTemplateScriptsTab getScriptsTab() {
+        return scriptsTab;
+    }
 }

Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java?rev=1158675&r1=1158674&r2=1158675&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java Wed Aug 17 12:50:31 2011
@@ -38,6 +38,7 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.CayenneModelerFrame;
 import org.apache.cayenne.modeler.editor.EditorView;
+import org.apache.cayenne.modeler.editor.SQLTemplateTabbedView;
 import org.apache.cayenne.modeler.util.TextAdapter;
 import org.apache.cayenne.query.EJBQLQuery;
 import org.apache.cayenne.query.SQLTemplate;
@@ -49,6 +50,7 @@ public class TextCompoundEdit extends Co
 
     private TreePath treePath;
     private int selectedTabIndex;
+    private int selectedItem;
     private JTabbedPane tabbedPane;
 
     private Object targetObject;
@@ -95,6 +97,12 @@ public class TextCompoundEdit extends Co
 
         if (targetObject instanceof SQLTemplate) {
             tabbedPane = editorView.getSqlTemplateView();
+            
+            if (tabbedPane != null) {
+                selectedItem = ((SQLTemplateTabbedView) tabbedPane)
+                        .getScriptsTab()
+                        .getSelectedIndex();
+            }
         }
 
         if (targetObject instanceof EJBQLQuery) {
@@ -129,6 +137,12 @@ public class TextCompoundEdit extends Co
 
         if (tabbedPane != null) {
             tabbedPane.setSelectedIndex(selectedTabIndex);
+            
+            if (tabbedPane instanceof SQLTemplateTabbedView) {
+                ((SQLTemplateTabbedView) tabbedPane)
+                        .getScriptsTab()
+                        .setSelectedIndex(selectedItem);
+            }
         }
     }