diff options
author | Eike Stepper | 2011-08-25 06:37:06 +0000 |
---|---|---|
committer | Eike Stepper | 2011-08-25 06:37:06 +0000 |
commit | 7163553f8f64af0bdb1747cbc3e40749a007db02 (patch) | |
tree | 3af229d3648b7f91e18c8a01d3e2854df2c19caf | |
parent | fdd242d0e82758453c76779cb014b9946b5aa2bd (diff) | |
download | cdo-7163553f8f64af0bdb1747cbc3e40749a007db02.tar.gz cdo-7163553f8f64af0bdb1747cbc3e40749a007db02.tar.xz cdo-7163553f8f64af0bdb1747cbc3e40749a007db02.zip |
added dumpContributionMarkup() and getReceiverType()
6 files changed, 23 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.workspace/plugin.xml b/plugins/org.eclipse.emf.cdo.workspace/plugin.xml index a671058d15..fe6b8a99f7 100644 --- a/plugins/org.eclipse.emf.cdo.workspace/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.workspace/plugin.xml @@ -23,7 +23,7 @@ <extension point="org.eclipse.core.expressions.propertyTesters"> <propertyTester - id="org.eclipse.emf.cdo.internal.workspace.WorkspaceProperties$Tester" + id="org.eclipse.emf.cdo.workspace.properties" type="org.eclipse.emf.cdo.workspace.CDOWorkspace" namespace="org.eclipse.emf.cdo.workspace" properties="open,branchPath,timeStamp,fixed,dirty,idGenerationLocation,base,local,remote" diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/WorkspaceProperties.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/WorkspaceProperties.java index 476d8432f3..b900371028 100644 --- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/WorkspaceProperties.java +++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/WorkspaceProperties.java @@ -131,9 +131,11 @@ public class WorkspaceProperties extends Properties<CDOWorkspace> */ public static final class Tester extends DefaultPropertyTester<CDOWorkspace> { + public static final String NAMESPACE = "org.eclipse.emf.cdo.workspace"; + public Tester() { - super(INSTANCE); + super(NAMESPACE, INSTANCE); } } } diff --git a/plugins/org.eclipse.emf.cdo/plugin.xml b/plugins/org.eclipse.emf.cdo/plugin.xml index ffacfc2463..4e12e9049f 100644 --- a/plugins/org.eclipse.emf.cdo/plugin.xml +++ b/plugins/org.eclipse.emf.cdo/plugin.xml @@ -39,13 +39,13 @@ <extension point="org.eclipse.core.expressions.propertyTesters"> <propertyTester - id="org.eclipse.emf.internal.cdo.session.SessionProperties$Tester" + id="org.eclipse.emf.cdo.session.properties" type="org.eclipse.emf.cdo.session.CDOSession" namespace="org.eclipse.emf.cdo.session" properties="open,sessionID,userID,passiveUpdateEnabled,lastUpdateTime,passiveUpdateMode,repositoryName,repositoryUUID,repositoryType,repositoryState,repositoryCreationTime,supportingAudits,supportingBranches,supportingEcore,ensureReferentialIntegrity,idGenerationLocation,storeType,objectIDTypes" class="org.eclipse.emf.internal.cdo.session.SessionProperties$Tester"/> <propertyTester - id="org.eclipse.emf.internal.cdo.view.ViewProperties$Tester" + id="org.eclipse.emf.cdo.view.properties" type="org.eclipse.emf.cdo.view.CDOView" namespace="org.eclipse.emf.cdo.view" properties="open,viewID,branchName,branch,timeStamp,lastUpdateTime,readOnly,dirty,durable,sessionID,userID" diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java index 81d229e1c3..c15cfd916e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java @@ -256,9 +256,11 @@ public class SessionProperties extends Properties<CDOSession> */
public static final class Tester extends DefaultPropertyTester<CDOSession>
{
+ public static final String NAMESPACE = "org.eclipse.emf.cdo.session";
+
public Tester()
{
- super(INSTANCE);
+ super(NAMESPACE, INSTANCE);
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java index 38ba6af35a..2afab16f15 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java @@ -156,9 +156,11 @@ public class ViewProperties extends Properties<CDOView> */ public static final class Tester extends DefaultPropertyTester<CDOView> { + public static final String NAMESPACE = "org.eclipse.emf.cdo.view"; + public Tester() { - super(INSTANCE); + super(NAMESPACE, INSTANCE); } } } diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/DefaultPropertyTester.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/DefaultPropertyTester.java index 49569b9780..1ce6cce585 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/DefaultPropertyTester.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/DefaultPropertyTester.java @@ -22,13 +22,21 @@ import java.util.List; */ public class DefaultPropertyTester<RECEIVER> extends PropertyTester implements IProperties<RECEIVER> { + private final String namespace; + private final IProperties<RECEIVER> properties; - public DefaultPropertyTester(IProperties<RECEIVER> properties) + public DefaultPropertyTester(String namespace, IProperties<RECEIVER> properties) { + this.namespace = namespace; this.properties = properties; } + public final String getNamespace() + { + return namespace; + } + public Class<RECEIVER> getReceiverType() { return properties.getReceiverType(); @@ -66,9 +74,9 @@ public class DefaultPropertyTester<RECEIVER> extends PropertyTester implements I { System.out.println(" <extension point=\"org.eclipse.core.expressions.propertyTesters\">"); System.out.println(" <propertyTester"); - System.out.println(" id=\"" + getClass().getName() + "\""); + System.out.println(" id=\"" + getNamespace() + ".properties\""); System.out.println(" type=\"" + getReceiverType().getName() + "\""); - System.out.println(" namespace=\"" + getClass().getPackage().getName() + "\""); + System.out.println(" namespace=\"" + getNamespace() + "\""); System.out.print(" properties=\""); boolean first = true; |