feature[ats_Q9NLC]: Change ArtNameLink to LayoutClickListener

2 files changed, 23 insertions, 14 deletions

diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java
index 3c81dfb..b3136bf 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java
@@ -10,23 +10,21 @@
  *******************************************************************************/
 package org.eclipse.osee.display.view.web.components;
 
-import java.util.HashMap;
-import java.util.Map;
 import org.eclipse.osee.display.api.data.WebArtifact;
 import org.eclipse.osee.display.api.search.SearchNavigator;
 import org.eclipse.osee.display.api.search.SearchPresenter;
 import org.eclipse.osee.display.view.web.CssConstants;
 import org.eclipse.osee.display.view.web.OseeAppData;
-import org.eclipse.osee.display.view.web.internal.search.OseeRoadMapAndNavigation;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.Resource;
+import com.vaadin.event.LayoutEvents.LayoutClickEvent;
+import com.vaadin.event.LayoutEvents.LayoutClickListener;
+import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Link;
 
 /**
  * @author Shawn F. Cook
  */
 @SuppressWarnings("serial")
-public class OseeArtifactNameLinkComponent extends Link {
+public class OseeArtifactNameLinkComponent extends HorizontalLayout {
 
    private final SearchPresenter searchPresenter = OseeAppData.getSearchPresenter();
    private final SearchNavigator navigator = OseeAppData.getNavigator();
@@ -38,13 +36,24 @@ public class OseeArtifactNameLinkComponent extends Link {
    public OseeArtifactNameLinkComponent(final WebArtifact artifact, String styleName) {
       super();
 
-      this.setCaption(artifact.getArtifactName());
-      Map<String, String> parameterMap = new HashMap<String, String>();
-      parameterMap.put(OseeRoadMapAndNavigation.ARTIFACT, artifact.getGuid());
-      String paramString = OseeRoadMapAndNavigation.parameterMapToRequestString(parameterMap);
-      Resource artifactLink = new ExternalResource(String.format("ats#AtsArtifactView%s", paramString));
-      this.setResource(artifactLink);
+      Link artifactNameLink = new Link();
+      artifactNameLink.setCaption(artifact.getArtifactName());
+      artifactNameLink.setStyleName(styleName);
+      this.addComponent(artifactNameLink);
+
+      this.addListener(new LayoutClickListener() {
+
+         @Override
+         public void layoutClick(LayoutClickEvent event) {
+            searchPresenter.selectArtifact(artifact, navigator);
+         }
+      });
+
+      //      Map<String, String> parameterMap = new HashMap<String, String>();
+      //      parameterMap.put(OseeRoadMapAndNavigation.ARTIFACT, artifact.getGuid());
+      //      String paramString = OseeRoadMapAndNavigation.parameterMapToRequestString(parameterMap);
+      //      Resource artifactLink = new ExternalResource(String.format("ats#AtsArtifactView%s", paramString));
+      //      artifactNameLink.setResource(artifactLink);
 
-      setStyleName(styleName);
    }
 }
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/UI.launch b/plugins/org.eclipse.osee.support.config/launchConfig/UI.launch
index 596eab7..115f82c 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/UI.launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/UI.launch
@@ -20,7 +20,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="target_bundles" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.ibm.icu@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default,org.objectweb.asm@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="timestamp" value="1317997004206"/>
+<stringAttribute key="timestamp" value="1317999940359"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>