catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.utils.ui/.classpath b/org.eclipse.osbp.utils.ui/.classpath
index 30a5795..502f456 100644
--- a/org.eclipse.osbp.utils.ui/.classpath
+++ b/org.eclipse.osbp.utils.ui/.classpath
@@ -4,6 +4,5 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src-gen/"/>
- <classpathentry kind="src" path="test/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.osbp.utils.ui/.project b/org.eclipse.osbp.utils.ui/.project
index 986b510..a06a55d 100644
--- a/org.eclipse.osbp.utils.ui/.project
+++ b/org.eclipse.osbp.utils.ui/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -42,6 +47,7 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/org.eclipse.osbp.utils.ui/build.properties b/org.eclipse.osbp.utils.ui/build.properties
index bfe78da..8577bb6 100644
--- a/org.eclipse.osbp.utils.ui/build.properties
+++ b/org.eclipse.osbp.utils.ui/build.properties
@@ -8,6 +8,7 @@
.project,\
.settings/,\
license.html,\
+ images/,\
LICENSE.txt,\
epl-2.0.html
src.includes = about.properties, about.mappings, about.ini, about.html, license.html,\
diff --git a/org.eclipse.osbp.utils.ui/images/error_tsk.png b/org.eclipse.osbp.utils.ui/images/error_tsk.png
new file mode 100644
index 0000000..487b5d7
--- /dev/null
+++ b/org.eclipse.osbp.utils.ui/images/error_tsk.png
Binary files differ
diff --git a/org.eclipse.osbp.utils.ui/images/info_tsk.png b/org.eclipse.osbp.utils.ui/images/info_tsk.png
new file mode 100644
index 0000000..d1fcbf3
--- /dev/null
+++ b/org.eclipse.osbp.utils.ui/images/info_tsk.png
Binary files differ
diff --git a/org.eclipse.osbp.utils.ui/images/warn_tsk.png b/org.eclipse.osbp.utils.ui/images/warn_tsk.png
new file mode 100644
index 0000000..b900f3b
--- /dev/null
+++ b/org.eclipse.osbp.utils.ui/images/warn_tsk.png
Binary files differ
diff --git a/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/problems/ProblemsPopup.java b/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/problems/ProblemsPopup.java
index 8a9cfdc..f5a15af 100644
--- a/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/problems/ProblemsPopup.java
+++ b/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/problems/ProblemsPopup.java
@@ -4,10 +4,9 @@
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent;
-import org.eclipse.osbp.runtime.common.event.IEventDispatcher;
import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent.EventDispatcherCommand;
+import org.eclipse.osbp.runtime.common.event.IEventDispatcher;
import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
-import org.eclipse.osbp.ui.api.user.IUser;
import com.vaadin.server.ClientConnector.DetachListener;
import com.vaadin.ui.Window;
@@ -21,8 +20,7 @@
private ProblemsViewContent problemsViewContent;
private String sender;
private String topic;
- private IUser user;
- private IDSLMetadataService dslMetadataService;
+ private transient IDSLMetadataService dslMetadataService;
public ProblemsPopup(IEclipseContext eclipseContext, Locale locale, String sender, String topic) {
super();
@@ -37,7 +35,7 @@
setCaption(dslMetadataService.translate(locale.toLanguageTag(), "validationReport"));
problemsViewContent = new ProblemsViewContent();
setContent(problemsViewContent.createComponents(eclipseContext, locale, sender, topic));
- setWidth("520px");
+ setWidth("550px");
}
@Override
diff --git a/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/problems/ProblemsViewContent.java b/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/problems/ProblemsViewContent.java
index 3001586..548ccde 100644
--- a/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/problems/ProblemsViewContent.java
+++ b/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/problems/ProblemsViewContent.java
@@ -28,8 +28,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.server.Resource;
@@ -428,15 +426,15 @@
case OK:
case INFO:
return ResourceUtil.getResource(
- "platform:/plugin/org.eclipse.osbp.vaaclipse.addons.application/images/info_tsk.png");
+ "platform:/plugin/org.eclipse.osbp.utils.ui/images/info_tsk.png");
case WARNING:
return ResourceUtil.getResource(
- "platform:/plugin/org.eclipse.osbp.vaaclipse.addons.application/images/warn_tsk.png");
+ "platform:/plugin/org.eclipse.osbp.utils.ui/images/warn_tsk.png");
case ERROR:
case CRITICAL:
case SYSTEMERROR:
return ResourceUtil.getResource(
- "platform:/plugin/org.eclipse.osbp.vaaclipse.addons.application/images/error_tsk.png");
+ "platform:/plugin/org.eclipse.osbp.utils.ui/images/error_tsk.png");
default:
return null;
}
