feature[ats_E6W8N]: Polish AtsHeaderComp code

4 files changed, 58 insertions, 73 deletions

diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java
index 548edde..fcb2a75 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java
@@ -63,8 +63,8 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
          } catch (Exception e) {
             System.out.println("OseeArtifactNameLinkComponent.attach - CRITICAL ERROR: (AtsUiApplication) this.getApplication() threw an exception.");
          }
+         createLayout();
       }
-      createLayout();
       populated = true;
    }
 
@@ -117,82 +117,82 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
 
    @Override
    public void createLayout() {
-      this.removeAllComponents();
+      removeAllComponents();
       setHeight(null);
       setWidth(100, UNITS_PERCENTAGE);
+      setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_SMALL);
+
+      HorizontalLayout hLayout_Body = new HorizontalLayout();
+      HorizontalLayout hLayout_ProgBuildName = new HorizontalLayout();
+      HorizontalLayout hLayout_SearchTextBtn = new HorizontalLayout();
 
-      HorizontalLayout hLayoutRow0 = new HorizontalLayout();
-      HorizontalLayout hLayoutRow1 = new HorizontalLayout();
-      HorizontalLayout hLayoutRow2 = new HorizontalLayout();
-
-      //      Embedded oseeTitleLabel = new Embedded("", new ThemeResource("../osee/osee_large.png"));
-      //      oseeTitleLabel.setType(Embedded.TYPE_IMAGE);
-
-      Label spacer1 = new Label("");
-      spacer1.setHeight(null);
-      spacer1.setWidth(30, UNITS_PIXELS);
-      Label spacer2 = new Label("");
-      spacer2.setHeight(null);
-      spacer2.setWidth(30, UNITS_PIXELS);
-      hLayoutRow1.addComponent(programCombo);
-      hLayoutRow1.addComponent(spacer1);
-      hLayoutRow1.addComponent(buildCombo);
-      hLayoutRow1.addComponent(spacer2);
-      hLayoutRow1.addComponent(nameOnlyCheckBox);
-      hLayoutRow1.setComponentAlignment(programCombo, Alignment.MIDDLE_LEFT);
-      hLayoutRow1.setComponentAlignment(buildCombo, Alignment.MIDDLE_CENTER);
-      hLayoutRow1.setComponentAlignment(nameOnlyCheckBox, Alignment.BOTTOM_RIGHT);
+      Label hSpacer_ProgBuild = new Label("");
+      hSpacer_ProgBuild.setHeight(null);
+      hSpacer_ProgBuild.setWidth(30, UNITS_PIXELS);
+      Label hSpacer_BuildName = new Label("");
+      hSpacer_BuildName.setHeight(null);
+      hSpacer_BuildName.setWidth(30, UNITS_PIXELS);
 
       searchTextField.setStyleName(CssConstants.OSEE_SEARCH_TEXTFIELD);
-      Label spacer3 = new Label("");
-      spacer3.setHeight(null);
-      spacer3.setWidth(30, UNITS_PIXELS);
+
+      Label hSpacer_SearchTextBtn = new Label("");
+      hSpacer_SearchTextBtn.setHeight(null);
+      hSpacer_SearchTextBtn.setWidth(30, UNITS_PIXELS);
       Button searchButton = new Button("Search", new Button.ClickListener() {
          @Override
          public void buttonClick(ClickEvent event) {
             selectSearch();
          }
       });
-      hLayoutRow2.addComponent(searchTextField);
-      hLayoutRow2.addComponent(spacer3);
-      hLayoutRow2.addComponent(searchButton);
-      hLayoutRow2.setComponentAlignment(searchTextField, Alignment.MIDDLE_LEFT);
-      hLayoutRow2.setComponentAlignment(searchButton, Alignment.MIDDLE_RIGHT);
-
-      setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_SMALL);
 
-      OseeLogoLink oseeTitleLabel =
+      OseeLogoLink oseeLogoImg =
          new OseeLogoLink(navigator, CssConstants.OSEE_TITLE_MEDIUM_TEXT, AtsSearchResultsView.class);
-      Label spacer4 = new Label("");
-      spacer4.setWidth(15, UNITS_PIXELS);
-      oseeTitleLabel.setHeight(70, UNITS_PIXELS);
-      oseeTitleLabel.setWidth(70, UNITS_PIXELS);
+      Label hSpacer_LogoRight = new Label("");
+      hSpacer_LogoRight.setWidth(15, UNITS_PIXELS);
+
+      VerticalLayout vLayout_SearchCrit = new VerticalLayout();
+      vLayout_SearchCrit.setSizeUndefined();
+
+      Label hSpacer_LeftMarg = new Label();
+      hSpacer_LeftMarg.setWidth(CssConstants.OSEE_LEFTMARGINWIDTH, UNITS_PIXELS);
+
+      Label vSpacer_BotLine = new Label("");
+      vSpacer_BotLine.setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_FOOTER);
+
+      Label vSpacer_TopLine = new Label("");
+      vSpacer_TopLine.setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_FOOTER);
+
+      hLayout_ProgBuildName.addComponent(programCombo);
+      hLayout_ProgBuildName.addComponent(hSpacer_ProgBuild);
+      hLayout_ProgBuildName.addComponent(buildCombo);
+      hLayout_ProgBuildName.addComponent(hSpacer_BuildName);
+      hLayout_ProgBuildName.addComponent(nameOnlyCheckBox);
 
-      VerticalLayout rightSideVLayout = new VerticalLayout();
-      rightSideVLayout.addComponent(hLayoutRow1);
-      rightSideVLayout.addComponent(hLayoutRow2);
-      rightSideVLayout.setSizeUndefined();
+      hLayout_SearchTextBtn.addComponent(searchTextField);
+      hLayout_SearchTextBtn.addComponent(hSpacer_SearchTextBtn);
+      hLayout_SearchTextBtn.addComponent(searchButton);
 
-      Label spacer7 = new Label();
-      spacer7.setWidth(15, UNITS_PIXELS);
+      vLayout_SearchCrit.addComponent(hLayout_ProgBuildName);
+      vLayout_SearchCrit.addComponent(hLayout_SearchTextBtn);
 
-      hLayoutRow0.addComponent(spacer7);
-      hLayoutRow0.addComponent(oseeTitleLabel);
-      hLayoutRow0.addComponent(spacer4);
-      hLayoutRow0.addComponent(rightSideVLayout);
-      hLayoutRow0.setComponentAlignment(oseeTitleLabel, Alignment.TOP_CENTER);
-      hLayoutRow0.setComponentAlignment(rightSideVLayout, Alignment.TOP_CENTER);
+      hLayout_Body.addComponent(hSpacer_LeftMarg);
+      hLayout_Body.addComponent(oseeLogoImg);
+      hLayout_Body.addComponent(hSpacer_LogoRight);
+      hLayout_Body.addComponent(vLayout_SearchCrit);
 
-      Label spacer5 = new Label("");
-      spacer5.setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_FOOTER);
+      addComponent(vSpacer_TopLine);
+      addComponent(hLayout_Body);
+      addComponent(vSpacer_BotLine);
 
-      Label spacer6 = new Label("");
-      spacer6.setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_FOOTER);
+      hLayout_ProgBuildName.setComponentAlignment(programCombo, Alignment.MIDDLE_LEFT);
+      hLayout_ProgBuildName.setComponentAlignment(buildCombo, Alignment.MIDDLE_CENTER);
+      hLayout_ProgBuildName.setComponentAlignment(nameOnlyCheckBox, Alignment.BOTTOM_RIGHT);
 
-      addComponent(spacer6);
-      addComponent(hLayoutRow0);
-      addComponent(spacer5);
+      hLayout_SearchTextBtn.setComponentAlignment(searchTextField, Alignment.MIDDLE_LEFT);
+      hLayout_SearchTextBtn.setComponentAlignment(searchButton, Alignment.MIDDLE_RIGHT);
 
+      hLayout_Body.setComponentAlignment(oseeLogoImg, Alignment.TOP_CENTER);
+      hLayout_Body.setComponentAlignment(vLayout_SearchCrit, Alignment.TOP_CENTER);
    }
 
    @Override
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 f874f6b..5eb682f 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
@@ -60,4 +60,5 @@ public final class CssConstants {
 
    public static final String OSEE_CURRENTPAGELABEL = "osee-currentpagelabel";
 
+   public static final int OSEE_LEFTMARGINWIDTH = 15;
 }
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java
index 7bfcd9f..6e83b83 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java
@@ -55,8 +55,4 @@ public class OseeSearchHeaderComponent extends VerticalLayout implements SearchH
       //      selectSearch();
    }
 
-   protected void selectSearch() {
-      //Do nothing.  Needs override
-   }
-
 }
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 58fd7c6..e75b8a7 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
@@ -40,21 +40,9 @@
 }
 
 .osee-header {
-	/*	background: #FFFFFF url(osee_32.png) no-repeat scroll left top;*/
 	border: 1px solid #D0D0D0;
 }
 
-/*.osee-logo-text {
-	font-family: Verdana, serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size: 20px;
-	color: #black;
-	vertical-align: middle;
-	padding-left: 8px;
-	font-weight: bold
-}
-*/
 .osee-footer {
 	
 }