summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshawn.f.cook2011-10-10 18:18:54 (EDT)
committerRoberto E. Escobar2011-10-10 18:18:54 (EDT)
commit377daec6190859b7527521100430665095b62777 (patch)
tree372287f957eee4223b43e79516341797dbd5bc8f
parent74a8cafcbd1eed20ea19465262270118d3a65b2f (diff)
downloadorg.eclipse.osee-377daec6190859b7527521100430665095b62777.zip
org.eclipse.osee-377daec6190859b7527521100430665095b62777.tar.gz
org.eclipse.osee-377daec6190859b7527521100430665095b62777.tar.bz2
feature[ats_Q9NLC]: Improve appearance of SearchResults and Artifact views
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java14
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java2
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java5
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java31
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java38
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java35
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java12
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java4
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css13
9 files changed, 98 insertions, 56 deletions
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java
index 3eda921..002e1ba 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java
@@ -68,13 +68,13 @@ public class AtsWindowFactory {
layout.setWidth("100%");
for (final Class<?> viewClass : provider.getViews()) {
navigator.addView(viewClass.getSimpleName(), viewClass);
- menu.addItem(viewClass.getSimpleName(), new MenuBar.Command() {
-
- @Override
- public void menuSelected(MenuBar.MenuItem selectedItem) {
- navigator.navigateTo(viewClass);
- }
- });
+ // menu.addItem(viewClass.getSimpleName(), new MenuBar.Command() {
+ //
+ // @Override
+ // public void menuSelected(MenuBar.MenuItem selectedItem) {
+ // navigator.navigateTo(viewClass);
+ // }
+ // });
}
MenuBar menuBar = new AccountMenuBar();
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 88e4aa7..f88e726 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
@@ -49,5 +49,7 @@ public final class CssConstants {
public static final String OSEE_ATTRIBUTELABEL = "osee-attributelabel";
public static final String OSEE_ATTRIBUTEVALUE = "osee-attributevalue";
+ public static final String OSEE_ATTRIBUTESTITLELABEL = "osee-attributestitlelabel";
+ public static final String OSEE_ATTRIBUTESBORDER = "osee-attributesborder";
}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java
index c60277f..da79e844 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java
@@ -1,5 +1,6 @@
package org.eclipse.osee.display.view.web;
+import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
@SuppressWarnings("serial")
@@ -22,8 +23,8 @@ public class OseeFooter extends VerticalLayout {
// addComponent(ll);
// setComponentAlignment(ll, Alignment.MIDDLE_CENTER);
//
- // Label summary = new Label(getApplicationInfo());
- // addComponent(summary);
+ Label summary = new Label(getApplicationInfo());
+ addComponent(summary);
populated = true;
}
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 3a77e29..1b13704 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
@@ -53,14 +53,18 @@ public class OseeAttributeComponent extends VerticalLayout implements AttributeC
removeAllComponents();
final HorizontalLayout attributesLayout = new HorizontalLayout();
- final OseeShowHideButton showHideButton = new OseeShowHideButton("Attributes");
- showHideButton.addListener(new OseeShowHideButton.ClickListener() {
- @Override
- public void buttonClick(OseeShowHideButton.ClickEvent event) {
- attributesLayout.setVisible(showHideButton.isStateShow());
- }
- });
- attributesLayout.setVisible(showHideButton.isStateShow());
+
+ // final OseeShowHideButton showHideButton = new OseeShowHideButton("Attributes");
+ // showHideButton.addListener(new OseeShowHideButton.ClickListener() {
+ // @Override
+ // public void buttonClick(OseeShowHideButton.ClickEvent event) {
+ // attributesLayout.setVisible(showHideButton.isStateShow());
+ // }
+ // });
+ // attributesLayout.setVisible(showHideButton.isStateShow());
+
+ Label titleLabel = new Label("Attributes");
+ titleLabel.setStyleName(CssConstants.OSEE_ATTRIBUTESTITLELABEL);
VerticalLayout attrLabelsLayout = new VerticalLayout();
VerticalLayout attrValuesLayout = new VerticalLayout();
@@ -80,13 +84,20 @@ public class OseeAttributeComponent extends VerticalLayout implements AttributeC
Label spacer = new Label("");
spacer.setWidth(15, UNITS_PIXELS);
- attributesLayout.addComponent(attrLabelsLayout);
+ Label spacer2 = new Label("");
+ spacer2.setWidth(15, UNITS_PIXELS);
attributesLayout.addComponent(spacer);
+ attributesLayout.addComponent(attrLabelsLayout);
+ attributesLayout.addComponent(spacer2);
attributesLayout.addComponent(attrValuesLayout);
- addComponent(showHideButton);
+ addComponent(titleLabel);
+ // addComponent(showHideButton);
addComponent(attributesLayout);
setExpandRatio(attributesLayout, 1.0f);
+
+ attrLabelsLayout.setWidth(200, UNITS_PIXELS);
+ attrValuesLayout.setWidth(200, UNITS_PIXELS);
}
@Override
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
index 018a790..d59aeab 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
@@ -15,6 +15,7 @@ import org.eclipse.osee.display.api.data.WebArtifact;
import org.eclipse.osee.display.api.data.WebId;
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.OseeUiApplication;
import com.vaadin.data.Property;
import com.vaadin.data.Property.ValueChangeEvent;
@@ -30,8 +31,8 @@ import com.vaadin.ui.VerticalLayout;
public class OseeRelationsComponent extends VerticalLayout implements RelationComponent {
private boolean populated = false;
- private final ListSelect relationTypesListSelect = new ListSelect("Relation Types:");
- private final ListSelect relationsListSelect = new ListSelect("Relations:");
+ private final ListSelect relationTypesListSelect = new ListSelect();
+ private final ListSelect relationsListSelect = new ListSelect();
private SearchPresenter searchPresenter = null;
private SearchNavigator navigator = null;
private boolean lockRelTypesListener = false;
@@ -58,21 +59,22 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
final HorizontalLayout listBoxesLayout = new HorizontalLayout();
- final OseeShowHideButton showHideButton = new OseeShowHideButton("Relations");
- showHideButton.addListener(new OseeShowHideButton.ClickListener() {
+ // final OseeShowHideButton showHideButton = new OseeShowHideButton("Relations");
+ // showHideButton.addListener(new OseeShowHideButton.ClickListener() {
+ //
+ // @Override
+ // public void buttonClick(OseeShowHideButton.ClickEvent event) {
+ // listBoxesLayout.setVisible(showHideButton.isStateShow());
+ // }
+ // });
+ // //Initialize listBoxesLayout visibility
+ // listBoxesLayout.setVisible(showHideButton.isStateShow());
- @Override
- public void buttonClick(OseeShowHideButton.ClickEvent event) {
- listBoxesLayout.setVisible(showHideButton.isStateShow());
- }
- });
- //Initialize listBoxesLayout visibility
- listBoxesLayout.setVisible(showHideButton.isStateShow());
+ Label titleLabel = new Label("Relationships");
+ titleLabel.setStyleName(CssConstants.OSEE_ATTRIBUTESTITLELABEL);
relationTypesListSelect.setNullSelectionAllowed(false);
relationTypesListSelect.setImmediate(true);
- Label spacer = new Label();
- spacer.setWidth(15, UNITS_PIXELS);
relationsListSelect.setNullSelectionAllowed(false);
relationsListSelect.setImmediate(true);
@@ -109,11 +111,17 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
}
});
- listBoxesLayout.addComponent(relationTypesListSelect);
+ Label spacer = new Label();
+ spacer.setWidth(15, UNITS_PIXELS);
+ Label spacer2 = new Label();
+ spacer2.setWidth(15, UNITS_PIXELS);
listBoxesLayout.addComponent(spacer);
+ listBoxesLayout.addComponent(relationTypesListSelect);
+ listBoxesLayout.addComponent(spacer2);
listBoxesLayout.addComponent(relationsListSelect);
- addComponent(showHideButton);
+ addComponent(titleLabel);
+ // addComponent(showHideButton);
addComponent(listBoxesLayout);
setExpandRatio(listBoxesLayout, 1.0f);
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
index 6f8a78b..a1deace 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
@@ -17,42 +17,42 @@ import java.util.Iterator;
import org.eclipse.osee.display.api.components.SearchResultComponent;
import org.eclipse.osee.display.api.components.SearchResultsListComponent;
import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.Application;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
/**
* @author Shawn F. Cook
*/
@SuppressWarnings("serial")
-public class OseeSearchResultsListComponent extends VerticalLayout implements SearchResultsListComponent {
+public class OseeSearchResultsListComponent extends Panel implements SearchResultsListComponent {
+ VerticalLayout mainLayout = new VerticalLayout();
VerticalLayout bottomSpacer = new VerticalLayout();
HorizontalLayout manySearchResultsHorizLayout = new HorizontalLayout();
- @Override
- public void attach() {
- super.attach();
- Application app = this.getApplication();
- }
-
public OseeSearchResultsListComponent() {
- addComponent(manySearchResultsHorizLayout);
+ this.setSizeFull();
+ this.setScrollable(true);
+ this.setContent(mainLayout);
+ mainLayout.setMargin(false, false, false, true);
+
+ mainLayout.addComponent(manySearchResultsHorizLayout);
Label spacer2 = new Label("");
spacer2.setHeight(15, UNITS_PIXELS);
- addComponent(spacer2);
+ mainLayout.addComponent(spacer2);
bottomSpacer.setSizeFull();
- addComponent(bottomSpacer);
- setExpandRatio(bottomSpacer, 1.0f);
+ mainLayout.addComponent(bottomSpacer);
+ mainLayout.setExpandRatio(bottomSpacer, 1.0f);
}
@Override
public void clearAll() {
Collection<Component> removeTheseComponents = new ArrayList<Component>();
- for (Iterator<Component> iter = getComponentIterator(); iter.hasNext();) {
+ for (Iterator<Component> iter = mainLayout.getComponentIterator(); iter.hasNext();) {
Component component = iter.next();
if (component.getClass() == OseeSearchResultComponent.class) {
removeTheseComponents.add(component);
@@ -61,13 +61,13 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
//Remove the components
for (Component component : removeTheseComponents) {
- removeComponent(component);
+ mainLayout.removeComponent(component);
}
}
private int getManySearchResultComponents() {
int many = 0;
- for (Iterator<Component> iter = getComponentIterator(); iter.hasNext();) {
+ for (Iterator<Component> iter = mainLayout.getComponentIterator(); iter.hasNext();) {
Component component = iter.next();
if (component.getClass() == OseeSearchResultComponent.class) {
many++;
@@ -91,8 +91,8 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
@Override
public SearchResultComponent createSearchResult() {
OseeSearchResultComponent searchResultComp = new OseeSearchResultComponent();
- int spacerIndex = this.getComponentIndex(bottomSpacer);
- addComponent(searchResultComp, spacerIndex);
+ int spacerIndex = mainLayout.getComponentIndex(bottomSpacer);
+ mainLayout.addComponent(searchResultComp, spacerIndex);
updateManySearchResultsLabel();
return searchResultComp;
@@ -100,5 +100,6 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
@Override
public void setErrorMessage(String message) {
+ //TODO:
}
}
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 d096e8a..d3eaf67 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
@@ -56,18 +56,28 @@ public class OseeArtifactView extends CustomComponent implements Navigator.View,
if (artifact != null) {
VerticalLayout bodyVertLayout = new VerticalLayout();
+
breadcrumbComp.setArtifact(artifact);
- OseeArtifactNameLinkComponent artifactName = new OseeArtifactNameLinkComponent(artifact);
bodyVertLayout.addComponent(breadcrumbComp);
+
+ OseeArtifactNameLinkComponent artifactName = new OseeArtifactNameLinkComponent(artifact);
bodyVertLayout.addComponent(artifactName);
+
+ Label artifactType = new Label(String.format("[%s]", artifact.getArtifactType()), Label.CONTENT_XHTML);
+ bodyVertLayout.addComponent(artifactType);
+
VerticalLayout artRelSpacer = new VerticalLayout();
artRelSpacer.setHeight(15, UNITS_PIXELS);
bodyVertLayout.addComponent(artRelSpacer);
+
bodyVertLayout.addComponent(relationsComp);
+
VerticalLayout relAttrSpacer = new VerticalLayout();
relAttrSpacer.setHeight(15, UNITS_PIXELS);
bodyVertLayout.addComponent(relAttrSpacer);
+
bodyVertLayout.addComponent(attributeComp);
+
VerticalLayout bottomSpacer = new VerticalLayout();
bodyVertLayout.addComponent(bottomSpacer);
bodyVertLayout.setExpandRatio(bottomSpacer, 1.0f);
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java
index 807604b..80578ee 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java
@@ -42,10 +42,6 @@ public class OseeSearchResultsView extends CustomComponent implements Navigator.
searchResultsListComponent.setSizeFull();
leftMarginAndBody.setExpandRatio(searchResultsListComponent, 1.0f);
- leftMarginAndBody.addComponent(bodyVertLayout);
- bodyVertLayout.setSizeFull();
- leftMarginAndBody.setExpandRatio(bodyVertLayout, 1.0f);
-
final VerticalLayout vertLayout = new VerticalLayout();
vertLayout.addComponent(oseeSearchHeader);
vertLayout.setComponentAlignment(oseeSearchHeader, Alignment.TOP_LEFT);
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 62c5dee..20cc510 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
@@ -131,3 +131,16 @@
font-weight:bold;
}
+.osee-attributestitlelabel {
+ font-size: 14px;
+ color: black;
+ font-weight:bold;
+}
+
+.osee-attributesborder {
+ border-style:solid;
+ border-width:1px;
+}
+
+
+