Cleaned up renderer framework

12 files changed, 29 insertions, 56 deletions

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
index b8e76ecdd15..5caede54737 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
@@ -32,15 +32,13 @@ import org.eclipse.swt.graphics.Image;
  * @author Jeff C. Philips

  */

 public class DefaultArtifactRenderer implements IRenderer {

-   private String rendererId;

    private VariableMap options;

 

    /**

     * @param rendererId

     */

-   public DefaultArtifactRenderer(String rendererId) {

+   public DefaultArtifactRenderer() {

       super();

-      this.rendererId = rendererId;

    }

 

    /* (non-Javadoc)

@@ -114,20 +112,6 @@ public class DefaultArtifactRenderer implements IRenderer {
    }

 

    /* (non-Javadoc)

-    * @see org.eclipse.osee.framework.ui.skynet.render.IRenderer#getId()

-    */

-   public String getId() {

-      return rendererId;

-   }

-

-   /* (non-Javadoc)

-    * @see org.eclipse.osee.framework.ui.skynet.render.IRenderer#setId(java.lang.String)

-    */

-   public void setId(String rendererId) {

-      this.rendererId = rendererId;

-   }

-

-   /* (non-Javadoc)

     * @see org.eclipse.osee.framework.ui.skynet.render.IRenderer#getArtifactUrl(org.eclipse.osee.framework.skynet.core.artifact.Artifact, boolean)

     */

    public String getArtifactUrl(Artifact artifact) throws OseeCoreException {

@@ -177,7 +161,7 @@ public class DefaultArtifactRenderer implements IRenderer {
    */

    @Override

    public DefaultArtifactRenderer newInstance() throws OseeCoreException {

-      return new DefaultArtifactRenderer(getId());

+      return new DefaultArtifactRenderer();

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileRenderer.java
index cb73afea4a9..26a67a7ef1a 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileRenderer.java
@@ -43,8 +43,8 @@ public abstract class FileRenderer extends FileSystemRenderer {
    /**

     * @param rendererId

     */

-   public FileRenderer(String rendererId) {

-      super(rendererId);

+   public FileRenderer() {

+      super();

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java
index 665a4a8c775..f095fae07ae 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java
@@ -29,8 +29,8 @@ public abstract class FileSystemRenderer extends DefaultArtifactRenderer {
    /**

     * @param rendererId

     */

-   public FileSystemRenderer(String rendererId) {

-      super(rendererId);

+   public FileSystemRenderer() {

+      super();

    }

 

    private static IFolder workingFolder;

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
index 3dd83f73af5..96f09392d49 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
@@ -71,8 +71,6 @@ public interface IRenderer {
 

    public abstract String getArtifactUrl(Artifact artifact) throws OseeCoreException;

 

-   public abstract String getId();

-

    public abstract void setOptions(VariableMap options) throws OseeArgumentException;

 

    public abstract String getStringOption(String key) throws OseeArgumentException;

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java
index 863f8a63e63..651a9c99301 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java
@@ -59,8 +59,8 @@ public class NativeRenderer extends FileRenderer {
    /**
     * @param rendererId
     */
-   public NativeRenderer(String rendererId) {
-      super(rendererId);
+   public NativeRenderer() {
+      super();
    }
 
    /* (non-Javadoc)
@@ -76,7 +76,7 @@ public class NativeRenderer extends FileRenderer {
     */
    @Override
    public NativeRenderer newInstance() throws OseeCoreException {
-      return new NativeRenderer(getId());
+      return new NativeRenderer();
    }
 
    public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java
index 30eea5bdcc3..af9d64a35fb 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java
@@ -19,8 +19,8 @@ public class OpenOfficeWriterRenderer extends FileRenderer implements ITemplateR
    /**

     * @param rendererId

     */

-   public OpenOfficeWriterRenderer(String rendererId) {

-      super(rendererId);

+   public OpenOfficeWriterRenderer() {

+      super();

    }

 

    /* (non-Javadoc)

@@ -28,7 +28,7 @@ public class OpenOfficeWriterRenderer extends FileRenderer implements ITemplateR
     */

    @Override

    public OpenOfficeWriterRenderer newInstance() throws OseeCoreException {

-      return new OpenOfficeWriterRenderer(getId());

+      return new OpenOfficeWriterRenderer();

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java
index a698450e618..d11ab566803 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java
@@ -93,15 +93,9 @@ public class RendererManager {
          String bundleName = element.getContributor().getName();

          try {

             Class<IRenderer> clazz = Platform.getBundle(bundleName).loadClass(classname);

-            Constructor<IRenderer> constructor = clazz.getConstructor(new Class[] {String.class});

-            IRenderer renderer =

-                  constructor.newInstance(new Object[] {element.getDeclaringExtension().getUniqueIdentifier()});

-            if (renderers.containsKey(renderer.getId())) {

-               OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE,

-                     "Multiple renderers found with id [" + renderer.getId() + "]");

-            } else {

-               renderers.put(renderer.getId(), renderer);

-            }

+            Constructor<IRenderer> constructor = clazz.getConstructor();

+            IRenderer renderer = constructor.newInstance();

+            renderers.put(renderer.getClass().getCanonicalName(), renderer);

          } catch (Exception ex) {

             OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);

          } catch (NoClassDefFoundError er) {

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java
index fb73e3bf42b..4d80cbb51b3 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java
@@ -33,13 +33,12 @@ import org.eclipse.osee.framework.ui.skynet.render.word.template.WordTemplateMan
  */

 public class TisRenderer extends WordTemplateRenderer {

    private ArrayList<PreviewRendererData> previewData;

-   public static String RENDERER_EXTENSION = "org.eclipse.osee.framework.ui.skynet.tis";

 

    /**

     * @param rendererId

     */

-   public TisRenderer(String rendererId) {

-      super(rendererId);

+   public TisRenderer() {

+      super();

 

       previewData = new ArrayList<PreviewRendererData>(1);

       previewData.add(new PreviewRendererData("MS Word TIS Preview",

@@ -59,7 +58,7 @@ public class TisRenderer extends WordTemplateRenderer {
     */

    @Override

    public TisRenderer newInstance() throws OseeCoreException {

-      return new TisRenderer(getId());

+      return new TisRenderer();

    }

 

    public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) {

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java
index 3d6ed5dd365..317f9357167 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java
@@ -31,8 +31,8 @@ public class UrlRenderer extends DefaultArtifactRenderer {
     * @throws OseeTypeDoesNotExist
     * @throws OseeDataStoreException
     */
-   public UrlRenderer(String rendererId) throws OseeDataStoreException, OseeTypeDoesNotExist {
-      super(rendererId);
+   public UrlRenderer() throws OseeDataStoreException, OseeTypeDoesNotExist {
+      super();
       contentUrlType = AttributeTypeManager.getType("Content URL");
    }
 
@@ -41,7 +41,7 @@ public class UrlRenderer extends DefaultArtifactRenderer {
     */
    @Override
    public UrlRenderer newInstance() throws OseeCoreException {
-      return new UrlRenderer(getId());
+      return new UrlRenderer();
    }
 
    @Override
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeDocumentRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeDocumentRenderer.java
index d657dff1535..9618df1e426 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeDocumentRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeDocumentRenderer.java
@@ -36,15 +36,13 @@ import org.eclipse.osee.framework.ui.skynet.preferences.DiffPreferencePage;
  * @author Jeff C. Phillips

  */

 public class WholeDocumentRenderer extends WordRenderer {

-

-   public static final String RENDERER_EXTENSION = "org.eclipse.osee.framework.ui.skynet.render.WholeDocumentRenderer";

    private List<PreviewRendererData> previewData;

 

    /**

     * @param rendererId

     */

-   public WholeDocumentRenderer(String rendererId) {

-      super(rendererId);

+   public WholeDocumentRenderer() {

+      super();

 

       previewData = new ArrayList<PreviewRendererData>(1);

       previewData.add(new PreviewRendererData("MS Word Preview",

@@ -64,7 +62,7 @@ public class WholeDocumentRenderer extends WordRenderer {
     */

    @Override

    public WholeDocumentRenderer newInstance() throws OseeCoreException {

-      return new WholeDocumentRenderer(getId());

+      return new WholeDocumentRenderer();

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordRenderer.java
index c7b3cac0f04..64a1071b66d 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordRenderer.java
@@ -27,8 +27,8 @@ public abstract class WordRenderer extends FileRenderer {
    /**

     * @param rendererId

     */

-   public WordRenderer(String rendererId) {

-      super(rendererId);

+   public WordRenderer() {

+      super();

    }

 

    @Override

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
index f72ad5c0992..0fa396766e1 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
@@ -85,8 +85,8 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende
    /**

     * @param rendererId

     */

-   public WordTemplateRenderer(String rendererId) {

-      super(rendererId);

+   public WordTemplateRenderer() {

+      super();

 

       previewData = new ArrayList<PreviewRendererData>(2);

       previewData.add(new PreviewRendererData("MS Word Preview",

@@ -109,7 +109,7 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende
     */

    @Override

    public WordTemplateRenderer newInstance() throws OseeCoreException {

-      return new WordTemplateRenderer(getId());

+      return new WordTemplateRenderer();

    }

 

    /* (non-Javadoc)