You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/06/12 21:04:03 UTC
svn commit: r1492370 -
/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
Author: aadamchik
Date: Wed Jun 12 19:04:01 2013
New Revision: 1492370
URL: http://svn.apache.org/r1492370
Log:
CAY-1823 remove ":sync w/DbEntity" button from ObjEntity - it is redundant and already present on the entity toolbar.
patch by Artiom Kravchenko
Modified:
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java?rev=1492370&r1=1492369&r2=1492370&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java Wed Jun 12 19:04:01 2013
@@ -63,7 +63,6 @@ import org.apache.cayenne.modeler.graph.
import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.modeler.util.Comparators;
import org.apache.cayenne.modeler.util.ExpressionConvertor;
-import org.apache.cayenne.modeler.util.ModelerUtil;
import org.apache.cayenne.modeler.util.TextAdapter;
import org.apache.cayenne.modeler.util.combo.AutoCompletion;
import org.apache.cayenne.util.CayenneMapEntry;
@@ -103,7 +102,6 @@ public class ObjEntityTab extends JPanel
protected TextAdapter superClassName;
protected TextAdapter qualifier;
protected JComboBox dbEntityCombo;
- protected JButton syncWithDbEntityButton;
protected JComboBox superEntityCombo;
protected JButton tableLabel;
protected JCheckBox readOnly;
@@ -194,9 +192,6 @@ public class ObjEntityTab extends JPanel
tableLabel.setMargin(new Insets(0, 0, 0, 0));
tableLabel.setBorder(null);
- syncWithDbEntityButton = new JButton("Sync w/DbEntity");
- syncWithDbEntityButton.setIcon(ModelerUtil.buildIcon("icon-sync.gif"));
- syncWithDbEntityButton.setToolTipText("Sync this ObjEntity with its DBEntity");
isAbstract = new JCheckBox();
serverOnly = new JCheckBox();
@@ -217,36 +212,35 @@ public class ObjEntityTab extends JPanel
// assemble
FormLayout layout = new FormLayout(
- "right:100dlu, 3dlu, fill:135dlu, 3dlu, pref",
+ "right:100dlu, 3dlu, fill:143dlu",
"");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
builder.setDefaultDialogBorder();
builder.appendSeparator("ObjEntity Configuration");
- builder.append("ObjEntity Name:", name.getComponent(), 3);
- builder.append("Inheritance:", superEntityCombo, 3);
- builder.append(tableLabel, dbEntityCombo, syncWithDbEntityButton);
- isAbstractLabel = builder.append("Abstract class:", isAbstract, 3);
-
+ builder.append("ObjEntity Name:", name.getComponent());
+ builder.append("Inheritance:", superEntityCombo);
+ builder.append(tableLabel, dbEntityCombo);
+ isAbstractLabel = builder.append("Abstract class:", isAbstract);
builder.appendSeparator();
- builder.append("Java Class:", className.getComponent(), 3);
- superclassLabel = builder.append("Superclass:", superClassName.getComponent(), 3);
- builder.append("Qualifier:", qualifier.getComponent(), 3);
- builder.append("Read-Only:", readOnly, 3);
- builder.append("Optimistic Locking:", optimisticLocking, 3);
+ builder.append("Java Class:", className.getComponent());
+
+ superclassLabel = builder.append("Superclass:", superClassName.getComponent());
+ builder.append("Qualifier:", qualifier.getComponent());
+ builder.append("Read-Only:", readOnly);
+ builder.append("Optimistic Locking:", optimisticLocking);
// add callback-related stuff
- builder.append("Exclude superclass listeners:", excludeSuperclassListeners, 3);
- builder.append("Exclude default listeners:", excludeDefaultListeners, 3);
+ builder.append("Exclude superclass listeners:", excludeSuperclassListeners);
+ builder.append("Exclude default listeners:", excludeDefaultListeners);
clientSeparator = builder.appendSeparator("Java Client");
- serverOnlyLabel = builder.append("Not for Client Use:", serverOnly, 3);
+ serverOnlyLabel = builder.append("Not for Client Use:", serverOnly);
clientClassNameLabel = builder.append("Client Java Class:", clientClassName
- .getComponent(), 3);
+ .getComponent());
clientSuperClassNameLabel = builder.append(
"Client Superclass:",
- clientSuperClassName.getComponent(),
- 3);
+ clientSuperClassName.getComponent());
add(builder.getPanel(), BorderLayout.CENTER);
}
@@ -262,7 +256,7 @@ public class ObjEntityTab extends JPanel
// Change DbEntity for current ObjEntity
ObjEntity entity = mediator.getCurrentObjEntity();
DbEntity dbEntity = (DbEntity) dbEntityCombo.getSelectedItem();
- syncWithDbEntityButton.setEnabled(dbEntity != null);
+
if (dbEntity != entity.getDbEntity()) {
entity.setDbEntity(dbEntity);
@@ -355,8 +349,7 @@ public class ObjEntityTab extends JPanel
}
});
- syncWithDbEntityButton.addActionListener(new ObjEntitySyncAction(mediator
- .getApplication()));
+
readOnly.addActionListener(new ActionListener() {
@@ -651,8 +644,6 @@ public class ObjEntityTab extends JPanel
superClassName.getComponent().setEnabled(directTableMapping);
superclassLabel.setEnabled(directTableMapping);
- syncWithDbEntityButton.setEnabled(dbEntityCombo.getSelectedItem() != null);
-
clientSuperClassName.getComponent().setEnabled(
directTableMapping && clientFieldsEnabled);
clientSuperClassNameLabel.setEnabled(directTableMapping && clientFieldsEnabled);