Author: oltka
Date: Thu Dec 10 18:06:09 2009
New Revision: 889350
URL: http://svn.apache.org/viewvc?rev=889350&view=rev
Log:
CAY-1332
* some changes in ObjAttribute Inspector
* add organization in pom.xml
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java
cayenne/main/trunk/pom.xml
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java?rev=889350&r1=889349&r2=889350&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java
(original)
+++
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialogView.java
Thu Dec 10 18:06:09 2009
@@ -26,6 +26,8 @@
import java.awt.event.ActionListener;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
+import java.util.ArrayList;
+import java.util.Iterator;
import javax.swing.JButton;
import javax.swing.JComboBox;
@@ -35,6 +37,7 @@
import javax.swing.JScrollPane;
import javax.swing.JTextField;
+import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.CayenneTable;
import org.apache.cayenne.modeler.util.CayenneWidgetFactory;
@@ -76,7 +79,7 @@
static final String EMBEDDABLE_PANEL = "EMBEDDABLE_PANEL";
static final String FLATTENED_PANEL = "FLATTENED_PANEL";
- public ObjAttributeInfoDialogView(ProjectController mediator) {
+ public ObjAttributeInfoDialogView(final ProjectController mediator) {
this.mediator = mediator;
@@ -209,7 +212,13 @@
}
}
- if (isType) {
+ Iterator<Embeddable> embs =
mediator.getEmbeddableNamesInCurRentDataDomain().iterator();
+ ArrayList<String> embNames = new ArrayList<String>();
+ while (embs.hasNext()) {
+ embNames.add(embs.next().getClassName());
+ }
+
+ if (isType || !embNames.contains(type.getSelectedItem()) ) {
((CardLayout)
typeManagerPane.getLayout()).show(typeManagerPane, FLATTENED_PANEL);
}
else {
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=889350&r1=889349&r2=889350&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Thu Dec 10 18:06:09 2009
@@ -167,19 +167,20 @@
<timezone>+3</timezone>
</developer>
<developer>
- <name>Olga Tkachova</name>
- <roles>
- <role>Committer</role>
- </roles>
- </developer>
- <developer>
+ <name>Olga Tkachova</name>
+ <organization>ObjectStyle</organization>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ </developer>
+ <developer>
<id>evgeny</id>
<name>Evgeny Ryabitskiy</name>
<organization>Diasoft</organization>
<roles>
<role>Committer</role>
</roles>
- <timezone>+3</timezone>
+ <timezone>+3</timezone>
</developer>
</developers>
