[power-architect] r3769 committed - Changed all of the calls in Architect to DataEntryPanelBuilder.createD...

Wed, 21 Jul 2010 08:11:34 -0700 

Revision: 3769
Author: [email protected]
Date: Wed Jul 21 08:10:13 2010
Log: Changed all of the calls in Architect to DataEntryPanelBuilder.createDataEntryPanelDialog to pass in the action title (i.e. OK button name) using the OK_BUTTON_LABEL static String defined in the DataEntryPanelBuilder class, instead of passing in a straight "OK". 
http://code.google.com/p/power-architect/source/detail?r=3769

Modified:
 /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditColumnAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditTableAction.java 
 /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/CubeEditPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/CreateOLAPChildAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditCubeAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditDimensionAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditHierarchyAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditLevelAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditMeasureAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditSchemaAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditVirtualCubeAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/ImportSchemaAction.java /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/OLAPEditAction.java 

=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java Wed Jul 21 07:59:07 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java Wed Jul 21 08:10:13 2010 
@@ -267,7 +267,7 @@
         public void actionPerformed(ActionEvent e) {
JDialog criticManagerDialog = DataEntryPanelBuilder.createDataEntryPanelDialog( new CriticManagerPanel(currentSession), ArchitectFrame.this, - Messages.getString("ArchitectFrame.criticManagerName"), "OK"); + Messages.getString("ArchitectFrame.criticManagerName"), DataEntryPanelBuilder.OK_BUTTON_LABEL); 
             criticManagerDialog.pack();
             criticManagerDialog.setVisible(true);
         }
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditColumnAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditColumnAction.java Wed Jul 21 08:10:13 2010 
@@ -92,7 +92,7 @@
dialogTitle = Messages.getString("EditColumnAction.multiEditDialogTitle"); 
                }
                JDialog d = DataEntryPanelBuilder.createDataEntryPanelDialog(
- cep, frame, dialogTitle, Messages.getString("EditColumnAction.okOption")); + cep, frame, dialogTitle, DataEntryPanelBuilder.OK_BUTTON_LABEL); 
                d.setLocationRelativeTo(frame);
                d.setVisible(true);

@@ -156,8 +156,8 @@
                        JDialog editDialog = 
DataEntryPanelBuilder.createDataEntryPanelDialog(
                                        columnEditPanel,
                                        frame,
- Messages.getString("EditColumnAction.columnPropertiesDialogTitle", column.getName()), //$NON-NLS-1$ 
-                                        
Messages.getString("EditColumnAction.okOption"), //$NON-NLS-1$
+ Messages.getString("EditColumnAction.columnPropertiesDialogTitle", column.getName()), //$NON-NLS-1$ 
+                                       DataEntryPanelBuilder.OK_BUTTON_LABEL, 
//$NON-NLS-1$
                                         new Callable<Boolean>(){
                                                public Boolean call() {
                                                    if (addToTable) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditTableAction.java Wed Jul 21 07:16:53 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditTableAction.java Wed Jul 21 08:10:13 2010 
@@ -41,6 +41,7 @@
 import ca.sqlpower.sqlobject.SQLColumn;
 import ca.sqlpower.sqlobject.SQLObject;
 import ca.sqlpower.sqlobject.SQLTable;
+import ca.sqlpower.swingui.DataEntryPanel;
 import ca.sqlpower.swingui.DataEntryPanelBuilder;
 import ca.sqlpower.swingui.DataEntryPanelChangeUtil;

@@ -172,15 +173,20 @@
        }

        public void makeDialog(SQLTable table) {
-               tableEditPanel = new TableEditPanel(getSession(), table);
-               table.addSPListener(sqlTableListener);
-               tableEditPanel.getTablePane().addSPListener(tablePaneListener);
-
+           DataEntryPanel panel = makeDataEntryPanel(table);
                editDialog = DataEntryPanelBuilder.createDataEntryPanelDialog(
-                       tableEditPanel, frame,
- Messages.getString("EditTableAction.dialogTitle"), Messages.getString("EditTableAction.okOption")); //$NON-NLS-1$ //$NON-NLS-2$ 
+                       panel, frame,
+ Messages.getString("EditTableAction.dialogTitle"), DataEntryPanelBuilder.OK_BUTTON_LABEL); //$NON-NLS-1$ //$NON-NLS-2$ 
                editDialog.pack();
                editDialog.setLocationRelativeTo(frame);
                editDialog.setVisible(true);
        }
-}
+
+       public DataEntryPanel makeDataEntryPanel(SQLTable table) {
+           tableEditPanel = new TableEditPanel(getSession(), table);
+           table.addSPListener(sqlTableListener);
+           tableEditPanel.getTablePane().addSPListener(tablePaneListener);
+           return tableEditPanel;
+       }
+
+}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/CubeEditPanel.java Fri Mar 12 08:02:18 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/CubeEditPanel.java Wed Jul 21 08:10:13 2010 
@@ -123,7 +123,7 @@
final JButton viewEditButton = new JButton(new AbstractAction("Edit...") { 
             public void actionPerformed(ActionEvent e) {
JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(new ViewEntryPanel( - playPen.getSession(), getDatabase(), CubeEditPanel.this), playPen, "View Builder", "OK"); + playPen.getSession(), getDatabase(), CubeEditPanel.this), playPen, "View Builder", DataEntryPanelBuilder.OK_BUTTON_LABEL); 
                 dialog.pack();
                 dialog.setVisible(true);
             }
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java Wed Jul 21 08:10:13 2010 
@@ -94,7 +94,7 @@
                         mep,
                         SwingUtilities.getWindowAncestor(getPlaypen()),
                         "Dimension Usage Properties",
-                        "OK",
+                        DataEntryPanelBuilder.OK_BUTTON_LABEL,
                         okCall,
                         cancelCall);
                 d.setLocationRelativeTo(getPlaypen());
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/CreateOLAPChildAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/CreateOLAPChildAction.java Wed Jul 21 08:10:13 2010 
@@ -132,7 +132,7 @@
                 mep,
                 SwingUtilities.getWindowAncestor(getPlaypen()),
                 friendlyChildName + " Properties",
-                "OK",
+                DataEntryPanelBuilder.OK_BUTTON_LABEL,
                 okCall,
                 cancelCall);
         d.setLocationRelativeTo(getPlaypen());
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditCubeAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditCubeAction.java Wed Jul 21 08:10:13 2010 
@@ -55,7 +55,7 @@
     public void actionPerformed(ActionEvent e) {
         try {
DataEntryPanel panel = new CubeEditPanel(cube, getPlaypen(), getSession()); - JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Cube Properties", "OK"); + JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Cube Properties", DataEntryPanelBuilder.OK_BUTTON_LABEL); 
             dialog.setLocationRelativeTo(getSession().getArchitectFrame());
             dialog.setVisible(true);
         } catch (SQLObjectException ex) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditDimensionAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditDimensionAction.java Wed Jul 21 08:10:13 2010 
@@ -62,7 +62,7 @@
         try {
             DataEntryPanel panel = new DimensionEditPanel(dimension);
JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog( 
-                    panel, dialogOwner, "Dimension Properties", "OK");
+ panel, dialogOwner, "Dimension Properties", DataEntryPanelBuilder.OK_BUTTON_LABEL); 
             dialog.setLocationRelativeTo(getSession().getArchitectFrame());
             dialog.setVisible(true);
         } catch (SQLObjectException ex) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditHierarchyAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditHierarchyAction.java Wed Jul 21 08:10:13 2010 
@@ -55,7 +55,7 @@
     public void actionPerformed(ActionEvent e) {
         try {
             DataEntryPanel panel = new HierarchyEditPanel(hierarchy);
- JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Hierarchy Properties", "OK"); + JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Hierarchy Properties", DataEntryPanelBuilder.OK_BUTTON_LABEL); 
             dialog.setLocationRelativeTo(getSession().getArchitectFrame());
             dialog.setVisible(true);
         } catch (SQLObjectException ex) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditLevelAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditLevelAction.java Wed Jul 21 08:10:13 2010 
@@ -55,7 +55,7 @@
     public void actionPerformed(ActionEvent e) {
         try {
             DataEntryPanel panel = new LevelEditPanel(level);
- JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Level Properties", "OK"); + JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Level Properties", DataEntryPanelBuilder.OK_BUTTON_LABEL); 
             dialog.setLocationRelativeTo(getSession().getArchitectFrame());
             dialog.setVisible(true);
         } catch (SQLObjectException ex) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditMeasureAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditMeasureAction.java Wed Jul 21 08:10:13 2010 
@@ -55,7 +55,7 @@
     public void actionPerformed(ActionEvent e) {
         try {
             DataEntryPanel panel = new MeasureEditPanel(measure);
- JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Measure Properties", "OK"); + JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Measure Properties", DataEntryPanelBuilder.OK_BUTTON_LABEL); 
             dialog.setLocationRelativeTo(getSession().getArchitectFrame());
             dialog.setVisible(true);
         } catch (SQLObjectException ex) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditSchemaAction.java Thu Mar 4 08:08:10 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditSchemaAction.java Wed Jul 21 08:10:13 2010 
@@ -62,7 +62,7 @@
     public void actionPerformed(ActionEvent e) {
         try {
             DataEntryPanel panel = new SchemaEditPanel(session, schema);
- JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Schema Properties", "OK"); + JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Schema Properties", DataEntryPanelBuilder.OK_BUTTON_LABEL); 
             dialog.setLocationRelativeTo(session.getArchitectFrame());
             dialog.setVisible(true);
         } catch (SQLObjectException ex) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditVirtualCubeAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/EditVirtualCubeAction.java Wed Jul 21 08:10:13 2010 
@@ -58,7 +58,7 @@

     public void actionPerformed(ActionEvent e) {
         DataEntryPanel panel = new VirtualCubeEditPanel(vCube);
- JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Virtual Cube Properties", "OK"); + JDialog dialog = DataEntryPanelBuilder.createDataEntryPanelDialog(panel, dialogOwner, "Virtual Cube Properties", DataEntryPanelBuilder.OK_BUTTON_LABEL); 
         dialog.setLocationRelativeTo(getSession().getArchitectFrame());
         dialog.setVisible(true);
     }
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/ImportSchemaAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/ImportSchemaAction.java Wed Jul 21 08:10:13 2010 
@@ -137,7 +137,7 @@
                             schemaEditPanel,
                             frame,
                             "New Schema Properties",
-                            "OK",
+                            DataEntryPanelBuilder.OK_BUTTON_LABEL,
                             okCall,
                             cancelCall);
                     schemaEditDialog.setLocationRelativeTo(frame);
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/OLAPEditAction.java Mon Jul 12 08:21:11 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/olap/action/OLAPEditAction.java Wed Jul 21 08:10:13 2010 
@@ -105,7 +105,7 @@
                         schemaEditPanel,
                         frame,
                         "New Schema Properties",
-                        "OK",
+                        DataEntryPanelBuilder.OK_BUTTON_LABEL,
                         okCall,
                         cancelCall);
                 schemaEditDialog.setLocationRelativeTo(frame);

Reply via email to