svn commit: r601073 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor: DataMapTabbedView.java DataMapView.java EditorView.java datanode/DataNodeEditor.java

[aa...@apache.org]

Author: aadamchik
Date: Tue Dec  4 12:27:33 2007
New Revision: 601073

URL: http://svn.apache.org/viewvc?rev=601073&view=rev
Log:
CAY-924 Update CayenneModeler for OS X Leopard

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java
    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/datanode/DataNodeEditor.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java?rev=601073&r1=601072&r2=601073&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java Tue Dec  4 12:27:33 2007
@@ -18,6 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.editor;
 
+import java.awt.Color;
+
 import org.apache.cayenne.modeler.ProjectController;
 
 import javax.swing.*;
@@ -45,12 +47,14 @@
      * create tabs
      */
     private void initView() {
+      
         setTabPlacement(JTabbedPane.TOP);
 
         // add panels to tabs
         // note that those panels that have no internal scrollable tables
         // must be wrapped in a scroll pane
         JScrollPane dataMapView = new JScrollPane(new DataMapView(mediator));
+        dataMapView.setBackground(Color.WHITE);
         addTab("DataMap", dataMapView);
 
         DataMapCallbackListenersTab listenersPanel = new DataMapCallbackListenersTab(mediator);

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java?rev=601073&r1=601072&r2=601073&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java Tue Dec  4 12:27:33 2007
@@ -146,7 +146,7 @@
 
         // assemble
         FormLayout layout = new FormLayout(
-                "right:70dlu, 3dlu, fill:110dlu, 3dlu, fill:90",
+                "right:70dlu, 3dlu, fill:110dlu, 3dlu, fill:100",
                 "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
         builder.setDefaultDialogBorder();

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=601073&r1=601072&r2=601073&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 Tue Dec  4 12:27:33 2007
@@ -123,10 +123,10 @@
         detailPanel.add(new JScrollPane(domainView), DOMAIN_VIEW);
 
         DataNodeEditor nodeController = new DataNodeEditor(eventController);
-        detailPanel.add(new JScrollPane(nodeController.getView()), NODE_VIEW);
+        detailPanel.add(nodeController.getView(), NODE_VIEW);
 
         Component dataMapView = new DataMapTabbedView(eventController);
-        detailPanel.add(new JScrollPane(dataMapView), DATA_MAP_VIEW);
+        detailPanel.add(dataMapView, DATA_MAP_VIEW);
 
         Component procedureView = new ProcedureTabbedView(eventController);
         detailPanel.add(procedureView, PROCEDURE_VIEW);

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataNodeEditor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataNodeEditor.java?rev=601073&r1=601072&r2=601073&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataNodeEditor.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataNodeEditor.java Tue Dec  4 12:27:33 2007
@@ -21,6 +21,7 @@
 
 import java.awt.Component;
 
+import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 
 import org.apache.cayenne.modeler.ProjectController;
@@ -37,7 +38,7 @@
         super(parent);
 
         this.view = new JTabbedPane();
-        view.addTab("Main", new MainDataNodeEditor(parent).getView());
+        view.addTab("Main", new JScrollPane(new MainDataNodeEditor(parent).getView()));
         view.addTab("Adapter", new AdapterEditor(parent).getView());
     }