summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorTobias Schwarz2012-04-03 01:06:38 (EDT)
committer Uwe Stieber2012-04-03 01:06:38 (EDT)
commit8b3ada439679338d3c181de460e2c1a38013feec (patch)
tree253dac4c446dab0ca65ebdd1c50e3b0e06a845ec
parentc9c3d2e02340618caa2631dc3382245f47196038 (diff)
downloadorg.eclipse.tcf-8b3ada439679338d3c181de460e2c1a38013feec.zip
org.eclipse.tcf-8b3ada439679338d3c181de460e2c1a38013feec.tar.gz
org.eclipse.tcf-8b3ada439679338d3c181de460e2c1a38013feec.tar.bz2
Target Explorer: FIX persistence delegate contribution
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.rcp.application/.project28
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.rcp/.project28
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/plugin.xml9
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/interfaces/IURIPersistenceService.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/services/URIPersistenceService.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java2
7 files changed, 61 insertions, 18 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.rcp.application/.project b/target_explorer/plugins/org.eclipse.tcf.te.rcp.application/.project
new file mode 100644
index 0000000..2118081
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.rcp.application/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.tcf.te.rcp.application</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.rcp/.project b/target_explorer/plugins/org.eclipse.tcf.te.rcp/.project
new file mode 100644
index 0000000..0073454
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.rcp/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.tcf.te.rcp</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/plugin.xml
index b142107..6e9d117 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/plugin.xml
@@ -6,15 +6,6 @@
<extension-point id="delegates" name="%ExtensionPoint.delegates.name" schema="schema/delegates.exsd"/>
<extension-point id="bindings" name="%ExtensionPoint.bindings.name" schema="schema/bindings.exsd"/>
-<!-- Persistence delegate contributions -->
- <extension point="org.eclipse.tcf.te.runtime.persistence.delegates">
- <delegate
- class="org.eclipse.tcf.te.runtime.persistence.AbstractPropertiesPersistenceDelegate"
- id="org.eclipse.tcf.te.runtime.persistence.properties"
- label="%PropertiesFilePersistenceDelegate.label">
- </delegate>
- </extension>
-
<!-- Service contributions -->
<extension point="org.eclipse.tcf.te.runtime.services.services">
<service
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/interfaces/IURIPersistenceService.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/interfaces/IURIPersistenceService.java
index fdcb6c7..585c75d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/interfaces/IURIPersistenceService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/interfaces/IURIPersistenceService.java
@@ -36,12 +36,12 @@ public interface IURIPersistenceService extends IService {
* If the given URI is <code>null</code>, it will be determined by adapting the context
* to a {@link IPersistableURIProvider}. In this case the context must not be <code>null</code>.
*
- * @param uri The URI. Must not be <code>null</code>.
* @param context The context object or <code>null</code>.
+ * @param uri The URI. Must not be <code>null</code>.
*
* @throws IOException - if the operation fails
*/
- public Object read(URI uri, Object context) throws IOException;
+ public Object read(Object context, URI uri) throws IOException;
/**
* Deletes the persistence storage for the given context object via a persistence delegate.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/services/URIPersistenceService.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/services/URIPersistenceService.java
index 41942ce..439ef07 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/services/URIPersistenceService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/services/URIPersistenceService.java
@@ -47,10 +47,10 @@ public class URIPersistenceService extends AbstractService implements IURIPersis
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService#read(java.net.URI, java.lang.Object)
+ * @see org.eclipse.tcf.te.runtime.persistence.interfaces.IURIPersistenceService#read(java.lang.Object, java.net.URI)
*/
@Override
- public Object read(URI uri, Object context) throws IOException {
+ public Object read(Object context, URI uri) throws IOException {
Assert.isNotNull(context);
uri = uri != null ? uri : getURI(context);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml
index 6e9c8a3..fac06cf 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml
@@ -29,10 +29,6 @@
id="org.eclipse.tcf.te.tcf.locator.persistence.peerToString"
class="org.eclipse.tcf.te.tcf.locator.persistence.PeerToStringPersistenceDelegate">
</delegate>
- <delegate
- id="org.eclipse.tcf.te.tcf.locator.persistence.propertiesToString"
- class="org.eclipse.tcf.te.tcf.locator.persistence.AbstractPropertiesToStringPersistenceDelegate">
- </delegate>
</extension>
<!-- Persistence delegate bindings contributions -->
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java
index 8b81a07..aee732c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java
@@ -263,7 +263,7 @@ public class LocatorModelRefreshService extends AbstractLocatorModelService impl
for (File candidate : candidates) {
try {
IURIPersistenceService service = ServiceManager.getInstance().getService(IURIPersistenceService.class);
- IPeer tempPeer = (IPeer)service.read(candidate.getAbsoluteFile().toURI(), IPeer.class);
+ IPeer tempPeer = (IPeer)service.read(IPeer.class, candidate.getAbsoluteFile().toURI());
Map<String,String> attrs = new HashMap<String, String>(tempPeer.getAttributes());