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 2006/05/28 06:11:30 UTC
svn commit: r409918 - in
/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor:
ObjEntityRelationshipTab.java ObjRelationshipTableModel.java
Author: aadamchik
Date: Sat May 27 21:11:30 2006
New Revision: 409918
URL: http://svn.apache.org/viewvc?rev=409918&view=rev
Log:
Part of CAY-326 fix. replacing confusing disabled checkbox for ObjRelationship cardinality with a string
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java?rev=409918&r1=409917&r2=409918&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java Sat May 27 21:11:30 2006
@@ -67,6 +67,7 @@
import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton;
import javax.swing.JComboBox;
+import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.JToolBar;
@@ -113,7 +114,7 @@
*/
public class ObjEntityRelationshipTab extends JPanel implements ObjEntityDisplayListener,
ObjEntityListener, ObjRelationshipListener, ExistingSelectionProcessor {
-
+
private static final Logger logObj = Logger.getLogger(ObjEntityRelationshipTab.class);
private static final Object[] deleteRules = new Object[] {
@@ -135,12 +136,15 @@
initController();
}
- private void init() {
+ private void init() {
this.setLayout(new BorderLayout());
-
+
JToolBar toolBar = new JToolBar();
Application app = Application.getInstance();
- toolBar.add(app.getAction(CreateRelationshipAction.getActionName()).buildButton());
+ toolBar
+ .add(app
+ .getAction(CreateRelationshipAction.getActionName())
+ .buildButton());
toolBar.add(app.getAction(ObjEntitySyncAction.getActionName()).buildButton());
toolBar.addSeparator();
@@ -151,8 +155,11 @@
toolBar.add(resolve);
toolBar.addSeparator();
-
- toolBar.add(app.getAction(RemoveRelationshipAction.getActionName()).buildButton());
+
+ toolBar
+ .add(app
+ .getAction(RemoveRelationshipAction.getActionName())
+ .buildButton());
add(toolBar, BorderLayout.NORTH);
table = new CayenneTable();
@@ -200,11 +207,17 @@
*/
public void selectRelationship(ObjRelationship rel) {
if (rel == null) {
- Application.getInstance().getAction(RemoveRelationshipAction.getActionName()).setEnabled(false);
+ Application
+ .getInstance()
+ .getAction(RemoveRelationshipAction.getActionName())
+ .setEnabled(false);
return;
}
// enable the remove button
- Application.getInstance().getAction(RemoveRelationshipAction.getActionName()).setEnabled(true);
+ Application
+ .getInstance()
+ .getAction(RemoveRelationshipAction.getActionName())
+ .setEnabled(true);
ObjRelationshipTableModel model = (ObjRelationshipTableModel) table.getModel();
java.util.List rels = model.getObjectList();
@@ -213,7 +226,7 @@
table.select(relPos);
}
}
-
+
public void processExistingSelection(EventObject e) {
if (e instanceof ChangeEvent) {
table.clearSelection();
@@ -236,7 +249,7 @@
}
else
resolve.setEnabled(false);
-
+
RelationshipDisplayEvent ev = new RelationshipDisplayEvent(this, rel, mediator
.getCurrentObjEntity(), mediator.getCurrentDataMap(), mediator
.getCurrentDataDomain());
@@ -249,7 +262,7 @@
if (e.getSource() == this) {
return;
}
-
+
ObjEntity entity = (ObjEntity) e.getEntity();
// Important: process event even if this is the same entity,
// since the inheritance structure might have changed
@@ -269,18 +282,18 @@
*/
private Object[] createObjEntityComboModel() {
DataMap map = mediator.getCurrentDataMap();
-
+
// this actually happens per CAY-221... can't reproduce though
- if(map == null) {
+ if (map == null) {
logObj.warn("createObjEntityComboModel:: Null DataMap.");
return new Object[0];
}
-
- if(map.getNamespace() == null) {
+
+ if (map.getNamespace() == null) {
logObj.warn("createObjEntityComboModel:: Null DataMap namespace - " + map);
return new Object[0];
}
-
+
Collection objEntities = map.getNamespace().getObjEntities();
return objEntities.toArray();
}
@@ -317,8 +330,8 @@
* ObjRelationships were deleted.
*/
private void reloadEntityList(EntityEvent e) {
- if (e.getSource() != this){
- return;
+ if (e.getSource() != this) {
+ return;
}
// If current model added/removed, do nothing.
@@ -395,7 +408,7 @@
deleteRules,
false);
deleteRulesCombo.setEditable(false);
- deleteRulesCombo.setSelectedIndex(0); //Default to the first value
+ deleteRulesCombo.setSelectedIndex(0); // Default to the first value
editor = new DefaultCellEditor(deleteRulesCombo);
editor.setClickCountToStart(1);
col.setCellEditor(editor);
@@ -447,6 +460,12 @@
boolean hasFocus,
int row,
int column) {
+
+ // center cardinality column
+ int align = column == ObjRelationshipTableModel.REL_CARDINALITY
+ ? JLabel.CENTER
+ : JLabel.LEFT;
+ super.setHorizontalAlignment(align);
super.getTableCellRendererComponent(
table,
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java?rev=409918&r1=409917&r2=409918&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java Sat May 27 21:11:30 2006
@@ -126,7 +126,7 @@
case REL_LOCKING :
return "Used for Locking";
case REL_CARDINALITY :
- return "To Many";
+ return "Cardinality";
case REL_DELETERULE :
return "Delete Rule";
@@ -139,7 +139,6 @@
switch (col) {
case REL_TARGET :
return ObjEntity.class;
- case REL_CARDINALITY :
case REL_LOCKING :
return Boolean.class;
default :
@@ -166,7 +165,7 @@
return rel.isUsedForLocking() ? Boolean.TRUE : Boolean.FALSE;
}
else if (column == REL_CARDINALITY) {
- return rel.isToMany() ? Boolean.TRUE : Boolean.FALSE;
+ return rel.isToMany() ? "to many" : "to one";
}
else if (column == REL_DELETERULE) {
return DeleteRule.deleteRuleName(rel.getDeleteRule());