summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshawn.f.cook2011-11-01 19:14:48 (EDT)
committerRoberto E. Escobar2011-11-01 19:14:48 (EDT)
commitfddb19cfbf2698785da259d3a6430619a1054d52 (patch)
treedd07732f9edbf942b37b073b1a48aefa5945f8e7
parent9cc78c495ff9a76cb0e0f5a83bba859988f061f1 (diff)
downloadorg.eclipse.osee-fddb19cfbf2698785da259d3a6430619a1054d52.zip
org.eclipse.osee-fddb19cfbf2698785da259d3a6430619a1054d52.tar.gz
org.eclipse.osee-fddb19cfbf2698785da259d3a6430619a1054d52.tar.bz2
feature[ats_18K4T]: Polish code after review
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java14
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java6
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java2
3 files changed, 13 insertions, 9 deletions
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 c719a38..2c57bbe 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
@@ -22,6 +22,7 @@ import com.vaadin.ui.Label;
@SuppressWarnings("serial")
public class OseeBreadcrumbComponent extends HorizontalLayout {
private ViewArtifact artifact;
+ private boolean fixedHeight = false;
public OseeBreadcrumbComponent(ViewArtifact artifact) {
this.artifact = artifact;
@@ -32,6 +33,11 @@ public class OseeBreadcrumbComponent extends HorizontalLayout {
createLayout();
}
+ public OseeBreadcrumbComponent(boolean fixedHeight) {
+ this.fixedHeight = fixedHeight;
+ createLayout();
+ }
+
private void createLayout() {
removeAllComponents();
@@ -52,9 +58,11 @@ public class OseeBreadcrumbComponent extends HorizontalLayout {
}
}
} else {
- Label vSpacer = new Label();
- vSpacer.setHeight(15, UNITS_PIXELS);
- addComponent(vSpacer);
+ if (fixedHeight) {
+ Label vSpacer = new Label();
+ vSpacer.setHeight(15, UNITS_PIXELS);
+ addComponent(vSpacer);
+ }
}
}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java
index 70be342..6db88fc 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java
@@ -63,14 +63,10 @@ public class OseeExceptionDialogComponent extends Window implements EmailView {
switch (msgType) {
case MSGTYPE_ERROR:
- ComponentUtility.logError("OseeExceptionDialogComponent.[ctor] - ERROR: [%s] %s", mainWindow, shortMsg,
- longMsg);
msgTypeLabel.setCaption("Error!");
msgTypeLabel.setStyleName(CssConstants.OSEE_EXCEPTION_ERROR_TITLE_TEXT);
break;
case MSGTYPE_WARNING:
- ComponentUtility.logWarn("OseeExceptionDialogComponent.[ctor] - WARNING: [%s] %s", mainWindow, shortMsg,
- longMsg);
msgTypeLabel.setCaption("Warning:");
msgTypeLabel.setStyleName(CssConstants.OSEE_EXCEPTION_WARNING_TITLE_TEXT);
break;
@@ -235,7 +231,7 @@ public class OseeExceptionDialogComponent extends Window implements EmailView {
hLayout_Row0.addComponent(closeButton);
hLayout_Row1.addComponent(shortMsgLabel);
hLayout_Row2.addComponent(showHideDetailsButton);
- hLayout_Row2.addComponent(emailButton);
+ // hLayout_Row2.addComponent(emailButton);
hLayout_Row2.addComponent(emailSendButton);
hLayout_Row3_Exception.addComponent(longMsgTextArea);
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 bc93e7f..7a4cb2e 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 OseeBreadcrumbComponent breadcrumbComp = new OseeBreadcrumbComponent(true);
private final OseeArtifactNameLinkComponent artifactName = new OseeArtifactNameLinkComponent(true);
private final Label artifactType = new Label("", Label.CONTENT_XHTML);
private ViewArtifact artifact;