svn commit: r733871 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor: EditorView.java EjbqlTabbedView.java

[aadamchik]

Author: aadamchik
Date: Mon Jan 12 11:11:28 2009
New Revision: 733871

URL: http://svn.apache.org/viewvc?rev=733871&view=rev
Log:
CAY-1164 Implement EJBQL query support in the Modeler

fixing display of the EJBQL query panel on Leopard... the fix is similar to   
CAY-924

Modified:
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java?rev=733871&r1=733870&r2=733871&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
 Mon Jan 12 11:11:28 2009
@@ -145,7 +145,7 @@
         detailPanel.add(new JScrollPane(procedureQueryView), 
PROCEDURE_QUERY_VIEW);
        
         Component ejbqlQueryView = new EjbqlTabbedView(eventController);
-        detailPanel.add(new JScrollPane(ejbqlQueryView), EJBQL_QUERY_VIEW);
+        detailPanel.add(ejbqlQueryView, EJBQL_QUERY_VIEW);
 
         objDetailView = new ObjEntityTabbedView(eventController);
         detailPanel.add(objDetailView, OBJ_VIEW);

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java?rev=733871&r1=733870&r2=733871&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
 Mon Jan 12 11:11:28 2009
@@ -27,8 +27,6 @@
 import org.apache.cayenne.modeler.event.QueryDisplayListener;
 import org.apache.cayenne.query.EJBQLQuery;
 
-
-
 public class EjbqlTabbedView extends JTabbedPane {
 
     protected ProjectController mediator;
@@ -44,7 +42,7 @@
 
     private void initView() {
         setTabPlacement(JTabbedPane.TOP);
-        
+
         this.mainTab = new EjbqlQueryMainTab(mediator);
         addTab("General", new JScrollPane(mainTab));
 
@@ -96,4 +94,5 @@
                 scriptsTab.initFromModel();
                 break;
         }
-    }}
+    }
+}