summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-07 07:01:12 (EDT)
committerEike Stepper2007-08-07 07:01:12 (EDT)
commitf9ce120c14368d8b4e79116bbc5e220187a0b5dc (patch)
treead1d4dc4e4f2fcdcc9f21c5473b67f3ebf94ad0c
parent422c25bafeecaaa34dc8e750a046abf8b97852fd (diff)
downloadcdo-f9ce120c14368d8b4e79116bbc5e220187a0b5dc.zip
cdo-f9ce120c14368d8b4e79116bbc5e220187a0b5dc.tar.gz
cdo-f9ce120c14368d8b4e79116bbc5e220187a0b5dc.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java10
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java23
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java2
4 files changed, 30 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index 955c819..b0d14e2 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -59,6 +59,7 @@ import org.eclipse.emf.edit.ui.util.EditUIUtil;
import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
import org.eclipse.emf.internal.cdo.CDOLegacyImpl;
import org.eclipse.emf.internal.cdo.CDOStateMachine;
+import org.eclipse.emf.internal.cdo.CDOTransactionImpl;
import org.eclipse.emf.internal.cdo.InternalCDOObject;
import org.eclipse.core.resources.IFile;
@@ -2195,8 +2196,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
if (resource != null)
{
- CDOObject object = ((CDOTransaction)view).newInstance(cdoClass);
- resource.getContents().add(object);
+ InternalCDOObject object = ((CDOTransactionImpl)view).newInstance(cdoClass);
+ resource.getContents().add(object.cdoInternalInstance());
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java
index 6153847..fe38127 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java
@@ -88,17 +88,17 @@ public abstract class CDOWrapperImpl implements InternalCDOObject
return instance;
}
- public EList<Adapter> eAdapters()
- {
- return instance.eAdapters();
- }
-
public EStructuralFeature cdoInternalDynamicFeature(int dynamicFeatureID)
{
// TODO Implement method CDOWrapperImpl.cdoInternalDynamicFeature()
throw new UnsupportedOperationException("Not yet implemented");
}
+ public EList<Adapter> eAdapters()
+ {
+ return instance.eAdapters();
+ }
+
public TreeIterator<EObject> eAllContents()
{
return instance.eAllContents();
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java
index 0dbb2c1..3090f41 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java
@@ -171,7 +171,16 @@ public class IntrospectorView extends ViewPart implements ISelectionListener
}
else
{
- label.setText(selection.toString() + " - " + selection.getClass().getName());
+ String className = selection.getClass().getName();
+ String value = selection.toString();
+ if (value.startsWith(className))
+ {
+ label.setText(value);
+ }
+ else
+ {
+ label.setText(className + ": " + value);
+ }
}
refreshViewer();
@@ -325,7 +334,17 @@ public class IntrospectorView extends ViewPart implements ISelectionListener
case 2:
return field.getType().getName();
case 3:
- return value == null ? "" : value.getClass().getName();
+ if (value == null)
+ {
+ return "";
+ }
+
+ if (value.getClass() == field.getType())
+ {
+ return "";
+ }
+
+ return value.getClass().getName();
}
}
catch (RuntimeException ex)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
index f9426a7..303f6d5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
@@ -31,7 +31,7 @@ public class RemoteTraceServer
{
public static final String DEFAULT_ADDRESS = "0.0.0.0"; //$NON-NLS-1$
- public static final int DEFAULT_PORT = 2037;
+ public static final int DEFAULT_PORT = 2035;
public static final int ANY_PORT = 0;