Author: rombert
Date: Mon Jul 22 20:57:13 2013
New Revision: 1505810

URL: http://svn.apache.org/r1505810
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure

Fixed tracing and also improved usage of OSGi services.

Added:
    
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java
      - copied, changed from r1505809, 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
Modified:
    sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options
    sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml
    
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
    
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
    
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
    
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java
    sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
    
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
    
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
    sling/whiteboard/asanso/plugins/eclipse/impl-resource/.options
    
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml
    sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml
    
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
    
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java

Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options Mon Jul 22 
20:57:13 2013
@@ -1 +1 @@
-org.apache.sling.slingclipse/debug=false
\ No newline at end of file
+org.apache.sling.ide.eclipse-core/debug=false
\ No newline at end of file

Modified: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml 
(original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml 
Mon Jul 22 20:57:13 2013
@@ -4,5 +4,6 @@
    <property name="listener.symbolic.name" type="String" 
value="org.apache.sling.ide.eclipse-core"/>
    <service>
       <provide interface="org.apache.sling.ide.eclipse.core.internal.Tracer"/>
+      <provide 
interface="org.eclipse.osgi.service.debug.DebugOptionsListener"/>
    </service>
 </scr:component>

Copied: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java
 (from r1505809, 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java)
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java&p1=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java&r1=1505809&r2=1505810&rev=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java
 Mon Jul 22 20:57:13 2013
@@ -14,9 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.ide.impl.resource.util;
+package org.apache.sling.ide.eclipse.core;
 
-public class Constants {
+import org.osgi.util.tracker.ServiceTracker;
 
-    public static final String PLUGIN_ID = "org.apache.sling.slingclipse.http";
+public class ServiceUtil {
+
+    public static <S, T> T getNotNull(ServiceTracker<S, T> serviceTracker) {
+        T service = serviceTracker.getService();
+        if (service == null)
+            throw new IllegalStateException("Service is null");
+
+        return service;
+    }
 }

Modified: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
 Mon Jul 22 20:57:13 2013
@@ -16,12 +16,13 @@
  */
 package org.apache.sling.ide.eclipse.core.internal;
 
+import org.apache.sling.ide.eclipse.core.ServiceUtil;
 import org.apache.sling.ide.filter.FilterLocator;
 import org.apache.sling.ide.serialization.SerializationManager;
 import org.apache.sling.ide.transport.Repository;
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -33,41 +34,29 @@ import org.osgi.framework.ServiceReferen
  */
 public class Activator extends Plugin {
 
-       // The plug-in ID
+    // The plug-in ID
     public static final String PLUGIN_ID = 
"org.apache.sling.ide.eclipse-core"; //$NON-NLS-1$
 
        // The shared instance
        private static Activator plugin;
 
-    private Repository repository;
-    private SerializationManager serializationManager;
-       private Tracer tracer;
-    private FilterLocator filterLocator;
-
-    private ServiceReference<Repository> repositoryRef;
-    private ServiceReference<SerializationManager> serializationManagerRef;
-    private ServiceReference<Tracer> tracerRef;
-    private ServiceReference<FilterLocator> filterLocatorRef;
+    private ServiceTracker<Repository, Repository> repository;
+    private ServiceTracker<SerializationManager, SerializationManager> 
serializationManager;
+    private ServiceTracker<FilterLocator, FilterLocator> filterLocator;
 
-       /*
-        * (non-Javadoc)
-        * @see 
org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-        */
        public void start(BundleContext context) throws Exception {
                super.start(context);
                plugin = this;
 
-        tracerRef = context.getServiceReference(Tracer.class);
-        tracer = context.getService(tracerRef);
-
-        repositoryRef = context.getServiceReference(Repository.class);
-        repository = context.getService(repositoryRef);
+        repository = new ServiceTracker<Repository, Repository>(context, 
Repository.class, null);
+        repository.open();
 
-        serializationManagerRef = 
context.getServiceReference(SerializationManager.class);
-        serializationManager = context.getService(serializationManagerRef);
+        serializationManager = new ServiceTracker<SerializationManager, 
SerializationManager>(context,
+                SerializationManager.class, null);
+        serializationManager.open();
 
-        filterLocatorRef = context.getServiceReference(FilterLocator.class);
-        filterLocator = context.getService(filterLocatorRef);
+        filterLocator = new ServiceTracker<FilterLocator, 
FilterLocator>(context, FilterLocator.class, null);
+        filterLocator.open();
        }
 
        /*
@@ -75,10 +64,9 @@ public class Activator extends Plugin {
         * @see 
org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
         */
        public void stop(BundleContext context) throws Exception {
-        context.ungetService(repositoryRef);
-        context.ungetService(serializationManagerRef);
-        context.ungetService(tracerRef);
-        context.ungetService(filterLocatorRef);
+        repository.close();
+        serializationManager.close();
+        filterLocator.close();
 
         plugin = null;
                super.stop(context);
@@ -93,19 +81,16 @@ public class Activator extends Plugin {
                return plugin;
        }
 
-    public Tracer getTracer() {
-        return tracer;
-    }
-
        public Repository getRepository() {
-        return repository;
+
+        return ServiceUtil.getNotNull(repository);
        }
 
     public SerializationManager getSerializationManager() {
-        return serializationManager;
+        return ServiceUtil.getNotNull(serializationManager);
     }
 
     public FilterLocator getFilterLocator() {
-        return filterLocator;
+        return ServiceUtil.getNotNull(filterLocator);
     }
 }

Modified: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
 Mon Jul 22 20:57:13 2013
@@ -55,10 +55,6 @@ public class SlingLaunchpadBehaviour ext
 
     private SerializationManager serializationManager;
 
-    public SlingLaunchpadBehaviour() {
-        serializationManager = 
Activator.getDefault().getSerializationManager();
-    }
-
     @Override
     public void stop(boolean force) {
 
@@ -87,8 +83,8 @@ public class SlingLaunchpadBehaviour ext
         }
     }
 
-    // TODO refine signature, visibility
-    protected void setupLaunch(ILaunch launch, String launchMode, 
IProgressMonitor monitor) throws CoreException {
+    // TODO refine signature
+    public void setupLaunch(ILaunch launch, String launchMode, 
IProgressMonitor monitor) throws CoreException {
         // TODO check that ports are free
 
         setServerRestartState(false);
@@ -230,11 +226,11 @@ public class SlingLaunchpadBehaviour ext
             return null;
         }
 
-        if (serializationManager.isSerializationFile(info.getLocation())) {
+        if (serializationManager().isSerializationFile(info.getLocation())) {
             try {
                 IFile file = (IFile) resource.getAdapter(IFile.class);
                 InputStream contents = file.getContents();
-                Map<String, String> serializationData = 
serializationManager.readSerializationData(contents);
+                Map<String, String> serializationData = 
serializationManager().readSerializationData(contents);
                 return repository.newUpdateContentNodeCommand(info, 
serializationData);
             } catch (IOException e) {
                 // TODO logging
@@ -324,4 +320,14 @@ public class SlingLaunchpadBehaviour ext
         return filter;
     }
 
+
+    private SerializationManager serializationManager() {
+        if (serializationManager == null) {
+            serializationManager = 
Activator.getDefault().getSerializationManager();
+        }
+
+        return serializationManager;
+    }
+
+
 }

Modified: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
 Mon Jul 22 20:57:13 2013
@@ -129,7 +129,6 @@ public class SlingLaunchpadServer extend
         setAttribute(PROP_PASSWORD, "admin");
     }
 
-
     @Override
     public int getPublishState() {
         return getAttribute(PROP_AUTO_PUBLISH_SETTING, PUBLISH_STATE_NEVER);

Modified: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java
 Mon Jul 22 20:57:13 2013
@@ -29,8 +29,8 @@ public class Tracer implements DebugOpti
     @Override
     public void optionsChanged(DebugOptions options) {
        
-       debugEnabled = options.getBooleanOption(Activator.PLUGIN_ID + "/debug", 
false);
-       trace = options.newDebugTrace(Activator.PLUGIN_ID, getClass());
+        debugEnabled = options.getBooleanOption(Activator.PLUGIN_ID + 
"/debug", false);
+        trace = options.newDebugTrace(Activator.PLUGIN_ID, getClass());
     }
     
     public void trace(String message, Object... arguments) {

Modified: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF 
(original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF Mon 
Jul 22 20:57:13 2013
@@ -45,5 +45,6 @@ Import-Package: org.apache.sling.ide.ecl
  org.eclipse.wst.server.ui,
  org.eclipse.wst.server.ui.editor,
  org.json,
- org.osgi.framework
+ org.osgi.framework,
+ org.osgi.util.tracker;version="1.5.0"
 Bundle-ActivationPolicy: lazy

Modified: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
 Mon Jul 22 20:57:13 2013
@@ -16,18 +16,18 @@
  */
 package org.apache.sling.ide.eclipse.ui.internal;
 
+import org.apache.sling.ide.eclipse.core.ServiceUtil;
 import org.apache.sling.ide.serialization.SerializationManager;
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
 
 public class Activator extends Plugin {
 
     public static final String PLUGIN_ID = "org.apache.sling.ide.eclipse-core";
     public static Activator INSTANCE;
 
-    private SerializationManager serializationManager;
-    private ServiceReference<SerializationManager> serializationManagerRef;
+    private ServiceTracker<SerializationManager, SerializationManager> 
serializationManager;
 
     public static Activator getDefault() {
 
@@ -38,8 +38,9 @@ public class Activator extends Plugin {
     public void start(BundleContext context) throws Exception {
         super.start(context);
 
-        serializationManagerRef = 
context.getServiceReference(SerializationManager.class);
-        serializationManager = context.getService(serializationManagerRef);
+        serializationManager = new ServiceTracker<SerializationManager, 
SerializationManager>(context,
+                SerializationManager.class, null);
+        serializationManager.open();
 
         INSTANCE = this;
     }
@@ -47,13 +48,12 @@ public class Activator extends Plugin {
     @Override
     public void stop(BundleContext context) throws Exception {
         INSTANCE = null;
-
-        context.ungetService(serializationManagerRef);
+        serializationManager.close();
 
         super.stop(context);
     }
 
     public SerializationManager getSerializationManager() {
-        return serializationManager;
+        return ServiceUtil.getNotNull(serializationManager);
     }
 }

Modified: 
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
 Mon Jul 22 20:57:13 2013
@@ -207,7 +207,7 @@ public class ImportWizard extends Wizard
                        createFolder(project, projectRelativePath.append(path));
                }else if(Repository.NT_RESOURCE.equals(primaryType)){
                        //DO NOTHING
-               }else{          
+        } else {
                        createFolder(project, projectRelativePath.append(path));
             String content = 
executeCommand(repository.newGetNodeContentCommand(path, ResponseType.JSON));
                        JSONObject jsonContent = new JSONObject(content);

Modified: sling/whiteboard/asanso/plugins/eclipse/impl-resource/.options
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/.options?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/.options (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/.options Mon Jul 22 
20:57:13 2013
@@ -1 +1 @@
-org.apache.sling.slingclipse.http/debug=false
\ No newline at end of file
+org.apache.sling.ide.impl-resource/debug=false
\ No newline at end of file

Modified: 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml
 Mon Jul 22 20:57:13 2013
@@ -4,5 +4,5 @@
    <service>
       <provide interface="org.apache.sling.ide.transport.Repository"/>
    </service>
-   <reference bind="bindTracer" cardinality="1..1" 
interface="org.apache.sling.ide.impl.resource.util.Tracer" name="Tracer" 
policy="static"/>
+   <reference bind="bindTracer" cardinality="1..1" 
interface="org.apache.sling.ide.impl.resource.util.Tracer" name="Tracer" 
policy="static" unbind="unbindTracer"/>
 </scr:component>

Modified: 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml 
(original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml 
Mon Jul 22 20:57:13 2013
@@ -4,5 +4,6 @@
    <property name="listener.symbolic.name" type="String" 
value="org.apache.sling.ide.impl-resource"/>
    <service>
       <provide interface="org.apache.sling.ide.impl.resource.util.Tracer"/>
+      <provide 
interface="org.eclipse.osgi.service.debug.DebugOptionsListener"/>
    </service>
 </scr:component>

Modified: 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
 Mon Jul 22 20:57:13 2013
@@ -41,6 +41,7 @@ public class RepositoryImpl extends Abst
     private final HttpClient httpClient = new HttpClient();
     private Tracer tracer;
 
+
        /* (non-Javadoc)
         * @see 
org.apache.sling.slingclipse.api.Repository#newAddNodeCommand(org.apache.sling.slingclipse.api.FileInfo)
         */
@@ -284,8 +285,6 @@ public class RepositoryImpl extends Abst
 
     public void bindTracer(Tracer tracer) {
 
-        System.out.println("Bound tracer " + tracer);
-
         this.tracer = tracer;
     }
 
@@ -309,7 +308,8 @@ public class RepositoryImpl extends Abst
 
             Result<T> result = command.execute();
 
-            tracer.trace("{} -> {}", command, result.toString());
+            if (tracer != null)
+                tracer.trace("{0} -> {1}", command, result.toString());
 
             return result;
         }

Modified: 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java?rev=1505810&r1=1505809&r2=1505810&view=diff
==============================================================================
--- 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
 (original)
+++ 
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
 Mon Jul 22 20:57:13 2013
@@ -18,5 +18,5 @@ package org.apache.sling.ide.impl.resour
 
 public class Constants {
 
-    public static final String PLUGIN_ID = "org.apache.sling.slingclipse.http";
+    public static final String PLUGIN_ID = 
"org.apache.sling.ide.impl-resource";
 }


Reply via email to