| author | shawn.f.cook | 2011-10-25 19:53:45 (EDT) |
|---|---|---|
| committer | Roberto E. Escobar | 2011-10-25 19:53:45 (EDT) |
| commit | 648efe1a07af17c79ad3e7727e999fe1afd067b2 (patch) (side-by-side diff) | |
| tree | 1a5b840c90af49b2097506497440642091bbc2e3 | |
| parent | 05b7d8517f16b1f447cc93f605e2f2b436fb32fd (diff) | |
| download | org.eclipse.osee-648efe1a07af17c79ad3e7727e999fe1afd067b2.zip org.eclipse.osee-648efe1a07af17c79ad3e7727e999fe1afd067b2.tar.gz org.eclipse.osee-648efe1a07af17c79ad3e7727e999fe1afd067b2.tar.bz2 | |
feature[ats_E6W8N]: Implement custom exception dialog
24 files changed, 277 insertions, 134 deletions
diff --git a/plugins/org.eclipse.osee.ats.mocks/src/org/eclipse/osee/ats/mocks/MockAtsSearchHeaderComponent.java b/plugins/org.eclipse.osee.ats.mocks/src/org/eclipse/osee/ats/mocks/MockAtsSearchHeaderComponent.java index 61bc633..b11187e 100644 --- a/plugins/org.eclipse.osee.ats.mocks/src/org/eclipse/osee/ats/mocks/MockAtsSearchHeaderComponent.java +++ b/plugins/org.eclipse.osee.ats.mocks/src/org/eclipse/osee/ats/mocks/MockAtsSearchHeaderComponent.java @@ -59,8 +59,8 @@ public class MockAtsSearchHeaderComponent implements AtsSearchHeaderComponent { } @Override - public void setErrorMessage(String message) { - errorMessage = message; + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + // errorMessage = message; } @Override 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 72b02c7..d8566f6 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 @@ -19,10 +19,10 @@ import org.eclipse.osee.ats.view.web.search.AtsSearchResultsView; import org.eclipse.osee.display.api.data.ViewId; import org.eclipse.osee.display.view.web.CssConstants; import org.eclipse.osee.display.view.web.components.ComponentUtility; +import org.eclipse.osee.display.view.web.components.OseeExceptionDialogComponent; import org.eclipse.osee.display.view.web.components.OseeLeftMarginContainer; import org.eclipse.osee.display.view.web.components.OseeLogoLink; import org.eclipse.osee.display.view.web.components.OseeSearchHeaderComponent; -import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.event.Action; @@ -37,8 +37,6 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Window.Notification; /** * @author Shawn F. Cook @@ -125,7 +123,6 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At } } - @Override public void createLayout() { setWidth(100, UNITS_PERCENTAGE); setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_SMALL); @@ -150,6 +147,11 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At searchButton.addListener(new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { + String msg = ""; + for (int i = 0; i < 1000; i++) { + msg += this.toString(); + msg += "\n"; + } selectSearch(); } }); @@ -262,19 +264,9 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At } @Override - public void setErrorMessage(String message) { - System.out.println(message); - Application app = this.getApplication(); - if (app != null) { - Window mainWindow = app.getMainWindow(); - if (mainWindow != null) { - mainWindow.showNotification(message, Notification.TYPE_ERROR_MESSAGE); - } else { - System.out.println("AtsSearchHeaderComponent.setErrorMessage - ERROR: Application.getMainWindow() returns null value."); - } - } else { - System.out.println("AtsSearchHeaderComponent.setErrorMessage - ERROR: getApplication() returns null value."); - } + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + OseeExceptionDialogComponent dlg = + new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); } //TODO: None of this works because Vaadin only supports key actions for Windows and Panel Objects. (this is diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java index 1935d3e..bc1202a 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java @@ -14,7 +14,11 @@ package org.eclipse.osee.display.api.components; * @author John Misinco */ public interface DisplaysErrorComponent { + public enum MsgType { + MSGTYPE_ERROR, + MSGTYPE_WARNING; + } - void setErrorMessage(String message); + void setErrorMessage(String shortMsg, String longMsg, MsgType msgType); } diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java index cde2ceb..ac69a5d 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java @@ -30,8 +30,8 @@ public class MockArtifactHeaderComponent implements ArtifactHeaderComponent { } @Override - public void setErrorMessage(String message) { - errorMessage = message; + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + errorMessage = shortMsg; } @Override diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttributeComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttributeComponent.java index 31fb847..a854ace 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttributeComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttributeComponent.java @@ -31,8 +31,8 @@ public class MockAttributeComponent implements AttributeComponent { } @Override - public void setErrorMessage(String message) { - errorMessage = message; + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + // errorMessage = message; } @Override diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockRelationComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockRelationComponent.java index 1403b34..b7770ae 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockRelationComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockRelationComponent.java @@ -57,8 +57,8 @@ public class MockRelationComponent implements RelationComponent { } @Override - public void setErrorMessage(String message) { - errorMessage = message; + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + // errorMessage = message; } @Override diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchHeaderComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchHeaderComponent.java index 1a4c0e5..1cffe33 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchHeaderComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchHeaderComponent.java @@ -29,8 +29,8 @@ public class MockSearchHeaderComponent implements SearchHeaderComponent { } @Override - public void setErrorMessage(String message) { - errorMessage = message; + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + // errorMessage = message; } @Override diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java index e9a989f..3cbb964 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java @@ -44,7 +44,7 @@ public class MockSearchResultComponent implements SearchResultComponent { } @Override - public void setErrorMessage(String message) { + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { } @Override diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java index 303a7c3..cca46ca 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java @@ -49,8 +49,8 @@ public class MockSearchResultsListComponent implements SearchResultsListComponen } @Override - public void setErrorMessage(String message) { - errorMessage = message; + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + // errorMessage = message; } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java index 85a3837..3aa5ccf 100644 --- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java +++ b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java @@ -21,6 +21,7 @@ import org.eclipse.osee.display.api.components.ArtifactHeaderComponent; import org.eclipse.osee.display.api.components.AttributeComponent; import org.eclipse.osee.display.api.components.DisplayOptionsComponent; import org.eclipse.osee.display.api.components.DisplaysErrorComponent; +import org.eclipse.osee.display.api.components.DisplaysErrorComponent.MsgType; import org.eclipse.osee.display.api.components.RelationComponent; import org.eclipse.osee.display.api.components.SearchHeaderComponent; import org.eclipse.osee.display.api.components.SearchResultComponent; 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 48571e0..3eb9adf 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 @@ -55,6 +55,9 @@ public final class CssConstants { public static final String OSEE_ATTRIBUTESBORDER = "osee-attributesborder"; public static final String OSEE_CURRENTPAGELABEL = "osee-currentpagelabel"; - public static final int OSEE_LEFTMARGINWIDTH = 15; + public static final String OSEE_EXCEPTION = "osee-exception"; + public static final String OSEE_EXCEPTION_ERROR_TITLE_TEXT = "osee-exception-error-title-text"; + public static final String OSEE_EXCEPTION_WARNING_TITLE_TEXT = "osee-exception-warning-title-text"; + public static final String OSEE_EXCEPTION_LONGMSG = "osee-exception-longmsg"; } 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 71f6835..6cb04a1 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 @@ -78,8 +78,11 @@ public class OseeArtifactNameLinkComponent extends HorizontalLayout { return artifact; } + private int debugindex = 0; + 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 3cce22c..1427df0 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 @@ -15,12 +15,9 @@ import java.util.ArrayList; import java.util.Collection; import org.eclipse.osee.display.api.components.AttributeComponent; import org.eclipse.osee.display.view.web.CssConstants; -import com.vaadin.Application; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Window.Notification; /** * @author Shawn F. Cook @@ -107,18 +104,9 @@ public class OseeAttributeComponent extends VerticalLayout implements AttributeC } @Override - public void setErrorMessage(String message) { - Application app = this.getApplication(); - if (app != null) { - Window mainWindow = app.getMainWindow(); - if (mainWindow != null) { - mainWindow.showNotification(message, Notification.TYPE_ERROR_MESSAGE); - } else { - System.out.println("OseeAttributeComponent.setErrorMessage - ERROR: Application.getMainWindow() returns null value."); - } - } else { - System.out.println("OseeAttributeComponent.setErrorMessage - ERROR: getApplication() returns null value."); - } + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + OseeExceptionDialogComponent dlg = + new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); } @Override 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 new file mode 100644 index 0000000..faa4def --- a/dev/null +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java @@ -0,0 +1,155 @@ +/******************************************************************************* + * Copyright (c) 2011 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.display.view.web.components; + +import org.eclipse.osee.display.api.components.DisplaysErrorComponent.MsgType; +import org.eclipse.osee.display.view.web.CssConstants; +import com.vaadin.event.ShortcutAction.KeyCode; +import com.vaadin.terminal.ThemeResource; +import com.vaadin.ui.Alignment; +import com.vaadin.ui.Button; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.TextField; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; + +/** + * @author Shawn F. Cook + */ +@SuppressWarnings("serial") +public class OseeExceptionDialogComponent extends Window { + + private final Label msgTypeLabel = new Label(); + private final Label shortMsgLabel = new Label(); + private final TextField longMsgTextArea = new TextField(); + private final Button showHideDetailsButton = new Button("Show Details"); + private final Button closeButton = new Button(); + private final Window mainWindow; + private final int HEIGHT_CLOSED = 100; + private final int HEIGHT_OPEN = 210; + private final int WIDTH = 400; + private final int MARGIN = 15; + + public OseeExceptionDialogComponent(MsgType msgType, String shortMsg, String longMsg, Window mainWindow) { + this.mainWindow = mainWindow; + createLayout(); + + switch (msgType) { + case MSGTYPE_ERROR: + msgTypeLabel.setCaption("Error!"); + msgTypeLabel.setStyleName(CssConstants.OSEE_EXCEPTION_ERROR_TITLE_TEXT); + break; + case MSGTYPE_WARNING: + msgTypeLabel.setCaption("Warning:"); + msgTypeLabel.setStyleName(CssConstants.OSEE_EXCEPTION_WARNING_TITLE_TEXT); + break; + default: + break; + } + + shortMsgLabel.setCaption(shortMsg); + longMsgTextArea.setValue(longMsg); + + if (mainWindow != null) { + mainWindow.addWindow(this); + moveToCenter(); + focus(); + } + } + + private void moveToCenter() { + float width = getApplication().getMainWindow().getWidth(); + float height = getApplication().getMainWindow().getHeight(); + + float centerx = width / 2.0f; + float centery = height / 2.0f; + + float halfwidth = this.getWidth() / 2.0f; + float halfheight = this.getHeight() / 2.0f; + + float x = centerx - halfwidth; + float y = centery - halfheight; + + setPositionX((int) x); + setPositionY((int) y); + } + + private void createLayout() { + setWidth(WIDTH, UNITS_PIXELS); + setHeight(HEIGHT_CLOSED, UNITS_PIXELS); + setCloseShortcut(KeyCode.ESCAPE); + setScrollable(false); + setStyleName(CssConstants.OSEE_EXCEPTION); + + shortMsgLabel.setWidth(null); + + longMsgTextArea.setWidth(WIDTH - MARGIN, UNITS_PIXELS); + longMsgTextArea.setHeight(HEIGHT_CLOSED, UNITS_PIXELS); + longMsgTextArea.setVisible(false); + longMsgTextArea.setStyleName(CssConstants.OSEE_EXCEPTION_LONGMSG); + showHideDetailsButton.setStyleName("link"); + showHideDetailsButton.addListener(new Button.ClickListener() { + @Override + public void buttonClick(Button.ClickEvent event) { + longMsgTextArea.setVisible(!longMsgTextArea.isVisible()); + if (longMsgTextArea.isVisible()) { + OseeExceptionDialogComponent.this.setHeight(HEIGHT_OPEN, UNITS_PIXELS); + } else { + OseeExceptionDialogComponent.this.setHeight(HEIGHT_CLOSED, UNITS_PIXELS); + } + } + }); + + closeButton.setStyleName("link"); + closeButton.setIcon(new ThemeResource("../osee/closebutton.png")); + closeButton.addListener(new Button.ClickListener() { + @Override + public void buttonClick(Button.ClickEvent event) { + mainWindow.removeWindow(OseeExceptionDialogComponent.this); + } + }); + + VerticalLayout vLayout_body = new VerticalLayout(); + HorizontalLayout row0 = new HorizontalLayout(); + HorizontalLayout row1 = new HorizontalLayout(); + HorizontalLayout row2 = new HorizontalLayout(); + HorizontalLayout row3 = new HorizontalLayout(); + + vLayout_body.setStyleName(CssConstants.OSEE_EXCEPTION); + + row0.setSizeFull(); + row1.setSizeFull(); + row2.setSizeFull(); + row3.setSizeFull(); + vLayout_body.setWidth(WIDTH - MARGIN, UNITS_PIXELS); + msgTypeLabel.setSizeUndefined(); + closeButton.setSizeUndefined(); + + Label vSpacer_AboveDetails = new Label(); + vSpacer_AboveDetails.setHeight(20, UNITS_PIXELS); + + row0.addComponent(msgTypeLabel); + row0.addComponent(closeButton); + row1.addComponent(shortMsgLabel); + row2.addComponent(longMsgTextArea); + row3.addComponent(showHideDetailsButton); + vLayout_body.addComponent(row0); + vLayout_body.addComponent(row1); + vLayout_body.addComponent(row2); + vLayout_body.addComponent(vSpacer_AboveDetails); + vLayout_body.addComponent(row3); + setContent(vLayout_body); + + row0.setComponentAlignment(closeButton, Alignment.TOP_RIGHT); + row3.setComponentAlignment(showHideDetailsButton, Alignment.BOTTOM_CENTER); + } +} 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 a459bea..091630d 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 @@ -16,7 +16,6 @@ import org.eclipse.osee.display.api.data.ViewId; 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 com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.Alignment; @@ -24,8 +23,6 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.ListSelect; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Window.Notification; /** * @author Shawn F. Cook @@ -211,18 +208,9 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo } @Override - public void setErrorMessage(String message) { - Application app = this.getApplication(); - if (app != null) { - Window mainWindow = app.getMainWindow(); - if (mainWindow != null) { - mainWindow.showNotification(message, Notification.TYPE_ERROR_MESSAGE); - } else { - System.out.println("OseeRelationsComponent.setErrorMessage - ERROR: Application.getMainWindow() returns null value."); - } - } else { - System.out.println("OseeRelationsComponent.setErrorMessage - ERROR: getApplication() returns null value."); - } + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + OseeExceptionDialogComponent dlg = + new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); } @Override 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 dc5996c..c4cc669 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 @@ -11,36 +11,12 @@ package org.eclipse.osee.display.view.web.components; import org.eclipse.osee.display.api.components.SearchHeaderComponent; -import org.eclipse.osee.display.api.data.ViewSearchParameters; import com.vaadin.ui.CustomComponent; /** * @author Shawn F. Cook */ @SuppressWarnings("serial") -public class OseeSearchHeaderComponent extends CustomComponent implements SearchHeaderComponent { - - @Override - public void attach() { - createLayout(); - } - - public void createLayout() { - //Do nothing. - } - - @Override - public void clearAll() { - //Do nothing. - } - - @Override - public void setErrorMessage(String message) { - //Do nothing. - } - - public void setSearchCriteria(ViewSearchParameters params) { - //Do nothing. - } +public abstract class OseeSearchHeaderComponent extends CustomComponent implements SearchHeaderComponent { } diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java index 87e42fd..d60a87e 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java @@ -20,13 +20,10 @@ import org.eclipse.osee.display.api.data.ViewSearchParameters; 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 com.vaadin.Application; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Window.Notification; /** * @author Shawn F. Cook @@ -102,18 +99,9 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR } @Override - public void setErrorMessage(String message) { - Application app = this.getApplication(); - if (app != null) { - Window mainWindow = app.getMainWindow(); - if (mainWindow != null) { - mainWindow.showNotification(message, Notification.TYPE_ERROR_MESSAGE); - } else { - System.out.println("OseeSearchResultComponent.setErrorMessage - ERROR: Application.getMainWindow() returns null value."); - } - } else { - System.out.println("OseeSearchResultComponent.setErrorMessage - ERROR: getApplication() returns null value."); - } + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + OseeExceptionDialogComponent dlg = + new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); } @Override 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 1f4edf6..aab41c3 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 @@ -20,7 +20,6 @@ import org.eclipse.osee.display.api.components.SearchResultsListComponent; import org.eclipse.osee.display.view.web.CssConstants; import org.eclipse.osee.display.view.web.components.OseePagingComponent.PageSelectedEvent; import org.eclipse.osee.display.view.web.components.OseePagingComponent.PageSelectedListener; -import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.Alignment; @@ -30,8 +29,6 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Window.Notification; /** * @author Shawn F. Cook @@ -193,18 +190,9 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se } @Override - public void setErrorMessage(String message) { - Application app = this.getApplication(); - if (app != null) { - Window mainWindow = app.getMainWindow(); - if (mainWindow != null) { - mainWindow.showNotification(message, Notification.TYPE_ERROR_MESSAGE); - } else { - System.out.println("OseeSearchResultsListComponent.setErrorMessage - ERROR: Application.getMainWindow() returns null value."); - } - } else { - System.out.println("OseeSearchResultsListComponent.setErrorMessage - ERROR: getApplication() returns null value."); - } + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + OseeExceptionDialogComponent dlg = + new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); } @Override 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 0e35709..87b13e0 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 @@ -16,15 +16,13 @@ import org.eclipse.osee.display.view.web.AbstractCommonView; import org.eclipse.osee.display.view.web.components.OseeArtifactNameLinkComponent; import org.eclipse.osee.display.view.web.components.OseeAttributeComponent; import org.eclipse.osee.display.view.web.components.OseeBreadcrumbComponent; +import org.eclipse.osee.display.view.web.components.OseeExceptionDialogComponent; import org.eclipse.osee.display.view.web.components.OseeRelationsComponent; -import com.vaadin.Application; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Window.Notification; /** * @author Shawn F. Cook @@ -142,17 +140,8 @@ public abstract class OseeArtifactView extends AbstractCommonView implements Art } @Override - public void setErrorMessage(String message) { - Application app = this.getApplication(); - if (app != null) { - Window mainWindow = app.getMainWindow(); - if (mainWindow != null) { - mainWindow.showNotification(message, Notification.TYPE_ERROR_MESSAGE); - } else { - System.out.println("OseeArtifactView.setErrorMessage - ERROR: Application.getMainWindow() returns null value."); - } - } else { - System.out.println("OseeArtifactView.setErrorMessage - ERROR: getApplication() returns null value."); - } + public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + OseeExceptionDialogComponent dlg = + new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); } } diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/UI.launch b/plugins/org.eclipse.osee.support.config/launchConfig/UI.launch index 97f46e6..e496471 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/UI.launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/UI.launch @@ -19,10 +19,10 @@ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8089"/> <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="target_bundles" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.collect@default:default,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="1318548088269"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<stringAttribute key="workspace_bundles" value="com.vaadin@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.ats.mocks@default:default,org.eclipse.osee.ats.presenter.mock@default:default,org.eclipse.osee.ats.view.web.test@default:false,org.eclipse.osee.ats.view.web@default:default,org.eclipse.osee.display.api@default:default,org.eclipse.osee.display.presenter.mocks@default:default,org.eclipse.osee.display.presenter.test@default:false,org.eclipse.osee.display.presenter@default:default,org.eclipse.osee.display.view.web@default:default,org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger.slf4j@default:default,org.eclipse.osee.logger@default:default,org.eclipse.osee.orcs.mock@default:default,org.eclipse.osee.orcs@default:default,org.eclipse.osee.vaadin.themes@default:false,org.eclipse.osee.vaadin.widgets@default:default,org.eclipse.osee.vaadin@default:default"/> +<stringAttribute key="workspace_bundles" value="com.vaadin@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.ats.mocks@default:default,org.eclipse.osee.ats.presenter.mock@default:default,org.eclipse.osee.ats.view.web.test@default:false,org.eclipse.osee.ats.view.web@default:default,org.eclipse.osee.display.api@default:default,org.eclipse.osee.display.presenter.mocks@default:default,org.eclipse.osee.display.presenter.test@default:false,org.eclipse.osee.display.presenter@default:default,org.eclipse.osee.display.view.web@default:default,org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.executor.admin.test@default:false,org.eclipse.osee.executor.admin@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger.slf4j@default:default,org.eclipse.osee.logger@default:default,org.eclipse.osee.orcs.mock@default:default,org.eclipse.osee.orcs@default:default,org.eclipse.osee.vaadin.themes@default:false,org.eclipse.osee.vaadin.widgets@default:default,org.eclipse.osee.vaadin@default:default"/> </launchConfiguration> diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/closebutton.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/closebutton.png Binary files differnew file mode 100644 index 0000000..68cd376 --- a/dev/null +++ b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/closebutton.png diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/error_icon.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/error_icon.png Binary files differnew file mode 100644 index 0000000..0109a73 --- a/dev/null +++ b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/error_icon.png 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 c1888e9..2bcb449 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 @@ -163,3 +163,71 @@ padding-left: 0px; } +.v-caption-osee-exception-error-title-text { + font-size: 20px; + color: red; + background-color: #F3E2E0; + font-weight:bold; + } + +.v-caption-osee-exception-warning-title-text { + font-size: 20px; + background-color: yellow; + color: orange; + font-weight:bold; + } + +.osee-exception { + margin: 10px 10px 10px 10px; + } + +.osee-exception-longmsg { + resize: none; + } + +.v-window-wrap { + border: none; + -webkit-border-radius: 12px; + -moz-border-radius: 12px; + border-radius: 12px; + overflow: hidden; + } + +.v-window-wrap2 { + background: #fff; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; + } + +.v-window-outerheader { + color: transparent; + padding: 0px; + max-width: 800px; + white-space: normal; + height: 0px; + } + +div.v-window-header { + white-space: normal; + } + +.v-window-closebox { + right: 0px; + top: 0px; + width: 0px; + height: 0px; + } + +.v-window-closebox:hover { + background-position: left bottom; + } + +.v-window-footer { + height: 0px; + } + +.v-window-resizebox { + width: 0px; + height: 0px; + } diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/warning_icon.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/warning_icon.png Binary files differnew file mode 100644 index 0000000..98d0dad --- a/dev/null +++ b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/warning_icon.png |

