summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshawn.f.cook2011-11-01 15:22:08 (EDT)
committerRoberto E. Escobar2011-11-01 15:22:08 (EDT)
commitabfc4e85d23180af2dfa0de274864707a466f437 (patch)
tree69d536d217e1bd2437f6eaaca0b1aa20179cad1b
parent5ce3a4e51c04bf1611ba61cee07f3a8479053996 (diff)
downloadorg.eclipse.osee-abfc4e85d23180af2dfa0de274864707a466f437.zip
org.eclipse.osee-abfc4e85d23180af2dfa0de274864707a466f437.tar.gz
org.eclipse.osee-abfc4e85d23180af2dfa0de274864707a466f437.tar.bz2
feature[ats_18K4T]: ArtName on ArtPage is not hyperlink
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java1
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java44
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java2
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java2
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java2
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css6
6 files changed, 40 insertions, 17 deletions
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java
index d4630d4..9b70734 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java
@@ -40,6 +40,7 @@ public final class CssConstants {
public static final String OSEE_SEARCHRESULTS_NORESULTS = "osee-searchresults-noresults";
public static final String OSEE_SEARCHRESULTS_MANYRESULTSFIELD = "osee-searchresults-manyresultsfield";
public static final String OSEE_SEARCHRESULT_ARTNAME = "osee-searchresult-artname";
+ public static final String OSEE_SEARCHRESULT_ARTNAME_NOLINK = "osee-searchresult-artname-nolink";
public static final String OSEE_SEARCHRESULT_ARTTYPE = "osee-searchresult-arttype";
public static final String OSEE_ATTRNAME = "osee-attrname";
public static final String OSEE_SEARCHRESULT_MATCH_MANY = "osee-searchresult-match-many";
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 a37b395..a1fe1b5 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
@@ -17,6 +17,7 @@ import org.eclipse.osee.display.view.web.CssConstants;
import com.vaadin.event.LayoutEvents.LayoutClickEvent;
import com.vaadin.event.LayoutEvents.LayoutClickListener;
import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
import com.vaadin.ui.Link;
/**
@@ -28,28 +29,38 @@ public class OseeArtifactNameLinkComponent extends HorizontalLayout {
private boolean isLayoutComplete = false;
private ViewArtifact artifact = null;
private final Link artifactNameLink = new Link();
+ private final Label artifactNameNOLink = new Label();
+ private boolean noLink = false;
public OseeArtifactNameLinkComponent(ViewArtifact artifact) {
- this(artifact, CssConstants.OSEE_SEARCHRESULT_ARTNAME);
+ this(artifact, CssConstants.OSEE_SEARCHRESULT_ARTNAME, false);
}
- public OseeArtifactNameLinkComponent(final ViewArtifact artifact, String styleName) {
+ public OseeArtifactNameLinkComponent(final ViewArtifact artifact, String styleName, boolean noLink) {
+ this.noLink = noLink;
this.artifact = artifact;
artifactNameLink.setStyleName(styleName);
+ artifactNameNOLink.setStyleName(CssConstants.OSEE_SEARCHRESULT_ARTNAME_NOLINK);
- addListener(new LayoutClickListener() {
- @Override
- public void layoutClick(LayoutClickEvent event) {
- String url = ComponentUtility.getUrl(OseeArtifactNameLinkComponent.this);
- SearchNavigator navigator = ComponentUtility.getNavigator(OseeArtifactNameLinkComponent.this);
- SearchPresenter presenter = ComponentUtility.getPresenter(OseeArtifactNameLinkComponent.this);
- presenter.selectArtifact(url, OseeArtifactNameLinkComponent.this.artifact, navigator);
- }
- });
+ if (!noLink) {
+ addListener(new LayoutClickListener() {
+ @Override
+ public void layoutClick(LayoutClickEvent event) {
+ String url = ComponentUtility.getUrl(OseeArtifactNameLinkComponent.this);
+ SearchNavigator navigator = ComponentUtility.getNavigator(OseeArtifactNameLinkComponent.this);
+ SearchPresenter presenter = ComponentUtility.getPresenter(OseeArtifactNameLinkComponent.this);
+ presenter.selectArtifact(url, OseeArtifactNameLinkComponent.this.artifact, navigator);
+ }
+ });
+ }
}
public OseeArtifactNameLinkComponent() {
- this(null, CssConstants.OSEE_SEARCHRESULT_ARTNAME);
+ this(null, CssConstants.OSEE_SEARCHRESULT_ARTNAME, false);
+ }
+
+ public OseeArtifactNameLinkComponent(boolean noLink) {
+ this(null, CssConstants.OSEE_SEARCHRESULT_ARTNAME, noLink);
}
@Override
@@ -63,14 +74,20 @@ public class OseeArtifactNameLinkComponent extends HorizontalLayout {
private void createLayout() {
if (artifact != null) {
artifactNameLink.setCaption(artifact.getArtifactName());
+ artifactNameNOLink.setValue(artifact.getArtifactName());
}
- addComponent(artifactNameLink);
+ if (noLink) {
+ addComponent(artifactNameNOLink);
+ } else {
+ addComponent(artifactNameLink);
+ }
}
public void updateLayout() {
if (artifact != null) {
artifactNameLink.setCaption(artifact.getArtifactName());
+ artifactNameNOLink.setValue(artifact.getArtifactName());
}
}
@@ -82,7 +99,6 @@ public class OseeArtifactNameLinkComponent extends HorizontalLayout {
public void setArtifact(ViewArtifact artifact) {
this.artifact = artifact;
- artifactNameLink.setDebugId(String.format("OseeArtifactNameLinkComponent.%s.%d", artifact.getGuid(), debugindex));
updateLayout();
}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java
index ac2849b..267393b 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java
@@ -78,7 +78,7 @@ public class OseeAttributeComponent extends VerticalLayout implements AttributeC
TextField attrValue = new TextField();
attrValue.setValue(value);
attrValue.setWidth(500, UNITS_PIXELS);
- attrValue.setHeight(100, UNITS_PERCENTAGE);
+ attrValue.setHeight(150, UNITS_PIXELS);
attributesLayout.setRows(attributesLayout.getRows() + 1);
attributesLayout.addComponent(attrValue, 2, rowIndex);
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java
index ad1638c..9dba0c7 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java
@@ -42,7 +42,7 @@ public class OseeBreadcrumbComponent extends HorizontalLayout {
for (int i = ancestryArray.length - 1; i >= 0; i--) {
ViewArtifact ancestor = (ViewArtifact) ancestryArray[i];
OseeArtifactNameLinkComponent crumbLabel =
- new OseeArtifactNameLinkComponent(ancestor, CssConstants.OSEE_BREADCRUMB_ARTNAME);
+ new OseeArtifactNameLinkComponent(ancestor, CssConstants.OSEE_BREADCRUMB_ARTNAME, false);
addComponent(crumbLabel);
if (i > 0) {
Label delimiter = new Label("  >>  ", Label.CONTENT_XHTML);
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java
index 4bda1c8..eef2135 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java
@@ -33,7 +33,7 @@ public abstract class OseeArtifactView extends AbstractCommonView implements Art
protected final OseeRelationsComponent relationsComp = new OseeRelationsComponent();
protected final OseeAttributeComponent attributeComp = new OseeAttributeComponent();
private final OseeBreadcrumbComponent breadcrumbComp = new OseeBreadcrumbComponent(null);
- private final OseeArtifactNameLinkComponent artifactName = new OseeArtifactNameLinkComponent();
+ private final OseeArtifactNameLinkComponent artifactName = new OseeArtifactNameLinkComponent(true);
private final Label artifactType = new Label("", Label.CONTENT_XHTML);
private ViewArtifact artifact;
private final int LEFTMARGIN_WIDTH = 5;
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css
index 14000c8..fb81830 100644
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css
+++ b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css
@@ -85,6 +85,12 @@
color: blue;
}
+.osee-searchresult-artname-nolink {
+ font-size: 14px;
+ color: blue;
+ font-weight: bold;
+}
+
.osee-searchresult-arttype {
font-size: 15px;
color: black;