Author: aadamchik
Date: Sat Jul 22 19:14:22 2006
New Revision: 424664
URL: http://svn.apache.org/viewvc?rev=424664&view=rev
Log:
CAY-604 -second patch
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/SingleModelElement.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java
Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath?rev=424664&r1=424663&r2=424664&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath (original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/.classpath Sat Jul 22
19:14:22 2006
@@ -8,8 +8,8 @@
<classpathentry kind="lib" path="lib/commons-lang-2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/hessian-3.0.13.jar"/>
- <classpathentry kind="lib" path="lib/smack-2.2.1.jar"/>
+ <classpathentry sourcepath="G:/soc/smack-dev-2.2.1/source" kind="lib"
path="lib/smack-2.2.1.jar"/>
<classpathentry kind="lib" path="lib/smackx-2.2.1.jar"/>
- <classpathentry kind="lib" path="lib/cayenne-client-nodeps-1.2.jar"/>
+ <classpathentry sourcepath="/cayenne-java/src/cayenne/java" kind="lib"
path="lib/cayenne-client-nodeps-1.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java?rev=424664&r1=424663&r2=424664&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ConnectionManager.java
Sat Jul 22 19:14:22 2006
@@ -17,11 +17,14 @@
package org.apache.cayenne.ropbrowser;
+import java.util.EventObject;
import java.util.Hashtable;
+import org.apache.cayenne.ropbrowser.model.AbstractObject;
import org.objectstyle.cayenne.CayenneContext;
import org.objectstyle.cayenne.DataChannel;
import org.objectstyle.cayenne.ObjectContext;
+import org.objectstyle.cayenne.event.EventSubject;
import org.objectstyle.cayenne.remote.ClientChannel;
import org.objectstyle.cayenne.remote.ClientConnection;
import org.objectstyle.cayenne.remote.hessian.HessianConnection;
@@ -60,7 +63,7 @@
return connections.get(address);
}
- ClientConnection connection = new HessianConnection(address);
//, null, null, "shared-session");
+ ClientConnection connection = new HessianConnection(address,
null, null, "conference");
DataChannel channel = new ClientChannel(connection);
// TODO configure query caching
ObjectContext context = new CayenneContext(channel);
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java?rev=424664&r1=424663&r2=424664&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/ObjectEditor.java
Sat Jul 22 19:14:22 2006
@@ -34,7 +34,9 @@
import org.eclipse.jface.action.IAction;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
+import org.objectstyle.cayenne.DataChannel;
import org.objectstyle.cayenne.ObjectContext;
+import org.objectstyle.cayenne.event.EventSubject;
/**
* Editor class allowing visual editing of database data via
@@ -126,7 +128,7 @@
protected void setInput(IEditorInput input) {
super.setInput(input);
this.context = ((ObjectEditorInput) input).getContext();
- elementDiagram = new ElementDiagram(this.context,
((ObjectEditorInput) input).getQuery());
+ elementDiagram = new ElementDiagram(this.context,
((ObjectEditorInput) input).getQuery());
}
protected void createActions() {
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java?rev=424664&r1=424663&r2=424664&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/AbstractObject.java
Sat Jul 22 19:14:22 2006
@@ -118,7 +118,12 @@
Object value = null;
if (attribute.getType().equals("java.util.Date")) {
- value =
dateFormatter.format(descriptor.getProperty(id.toString()).readProperty(this));
+ try {
+ value =
dateFormatter.format(descriptor.getProperty(id.toString()).readProperty(this));
+ }
+ catch (Exception e) {
+ value = new String("");
+ }
}
else {
value =
descriptor.getProperty(id.toString()).readProperty(this);
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java?rev=424664&r1=424663&r2=424664&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/ElementDiagram.java
Sat Jul 22 19:14:22 2006
@@ -19,10 +19,14 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList;
+import java.util.EventObject;
import java.util.Iterator;
import java.util.List;
+import org.apache.cayenne.ropbrowser.ConnectionManager;
+import org.objectstyle.cayenne.DataChannel;
import org.objectstyle.cayenne.ObjectContext;
+import org.objectstyle.cayenne.event.EventSubject;
import org.objectstyle.cayenne.query.NamedQuery;
/**
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/SingleModelElement.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/SingleModelElement.java?rev=424664&r1=424663&r2=424664&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/SingleModelElement.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/model/SingleModelElement.java
Sat Jul 22 19:14:22 2006
@@ -152,7 +152,7 @@
if (conn instanceof RelationshipConnection) {
RelationshipConnection relConn =
(RelationshipConnection) conn;
conn.getSource().getCurrentObject().setRelationship(relConn.getRelationship(),
getCurrentObject(), object);
-
//object.setRelationship(relConn.getRelationship(), object);
+
//object.setRelationship(relConn.getRelationship(), null,
conn.getSource().getCurrentObject()); wrong relationship name - need inverse
}
}
setObject(object);
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java?rev=424664&r1=424663&r2=424664&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/parts/ElementDiagramEditPart.java
Sat Jul 22 19:14:22 2006
@@ -204,6 +204,5 @@
}
}
return true;
-
}
}
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java?rev=424664&r1=424663&r2=424664&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser/src/org/apache/cayenne/ropbrowser/views/ControlPanelView.java
Sat Jul 22 19:14:22 2006
@@ -64,6 +64,8 @@
/** button to launch query editor */
private Button runQueryButton;
+ private Button xmppEnabledButton;
+
/** manages connections to the server */
private ConnectionManager connectionManager;
@@ -118,6 +120,8 @@
*/
public void widgetSelected(SelectionEvent e) {
if (e.getSource() == connectButton) {
+ queryCombo.removeAll();
+
if (serverText.indexOf(serverText.getText()) == -1) {
serverText.add(serverText.getText());
}
