You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2010/01/04 14:22:20 UTC
svn commit: r895620 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor:
EmbeddableAttributeTab.java EmbeddableTab.java
Author: oltka
Date: Mon Jan 4 13:22:20 2010
New Revision: 895620
URL: http://svn.apache.org/viewvc?rev=895620&view=rev
Log:
CAY-1355 Warning if rename Embeddable.
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableAttributeTab.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableTab.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableAttributeTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableAttributeTab.java?rev=895620&r1=895619&r2=895620&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableAttributeTab.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableAttributeTab.java Mon Jan 4 13:22:20 2010
@@ -58,7 +58,7 @@
import org.apache.cayenne.modeler.util.UIUtil;
import org.apache.cayenne.modeler.util.combo.AutoCompletion;
-public class EmbeddableAttributeTab extends JPanel implements
+public class EmbeddableAttributeTab extends JPanel implements
EmbeddableAttributeListener, EmbeddableDisplayListener, EmbeddableListener,
ExistingSelectionProcessor {
@@ -94,8 +94,10 @@
table = new CayenneTable();
- tablePreferences = new TableColumnPreferences(this.getClass(),"embeddable/attributeTable");
-
+ tablePreferences = new TableColumnPreferences(
+ this.getClass(),
+ "embeddable/attributeTable");
+
/**
* Create and install a popup
*/
@@ -183,7 +185,13 @@
AutoCompletion.enable(javaTypesCombo, false, true);
typeColumn.setCellEditor(CayenneWidgetFactory.createCellEditor(javaTypesCombo));
- tablePreferences.bind(table, null, null, null, EmbeddableAttributeTableModel.OBJ_ATTRIBUTE, true);
+ tablePreferences.bind(
+ table,
+ null,
+ null,
+ null,
+ EmbeddableAttributeTableModel.OBJ_ATTRIBUTE,
+ true);
}
@@ -237,15 +245,21 @@
if (embeddable != null) {
rebuildTable(embeddable);
}
-
}
-
+
public void embeddableAdded(EmbeddableEvent e, DataMap map) {
}
-
- public void embeddableChanged(EmbeddableEvent e, DataMap map) {
+
+ public void embeddableRemoved(EmbeddableEvent e, DataMap map) {
}
- public void embeddableRemoved(EmbeddableEvent e, DataMap map) {
+ public void embeddableChanged(EmbeddableEvent e, DataMap map) {
+ if (e.getOldName() != null) {
+ ((Embeddable)map.getEmbeddable(e.getOldName())).setClassName(e.getEmbeddable().getClassName());
+ if(map.getEmbeddableMap().containsKey(e.getOldName())){
+ map.removeEmbeddable(e.getOldName());
+ map.addEmbeddable(e.getEmbeddable());
+ }
+ }
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableTab.java?rev=895620&r1=895619&r2=895620&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableTab.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EmbeddableTab.java Mon Jan 4 13:22:20 2010
@@ -59,7 +59,6 @@
private void initController() {
mediator.addEmbeddableDisplayListener(this);
-
}
private void initView() {