Merge branch 'sprint94'
diff --git a/org.eclipse.ote.client.feature/feature.xml b/org.eclipse.ote.client.feature/feature.xml
index ec51514..a186fb4 100644
--- a/org.eclipse.ote.client.feature/feature.xml
+++ b/org.eclipse.ote.client.feature/feature.xml
@@ -45,7 +45,7 @@
unpack="false"/>
<plugin
- id="org.eclipse.ote.ui.message.view"
+ id="org.eclipse.ote.ui.message.search"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/org.eclipse.ote.parent/pom.xml b/org.eclipse.ote.parent/pom.xml
index b7c3404..ddaf563 100644
--- a/org.eclipse.ote.parent/pom.xml
+++ b/org.eclipse.ote.parent/pom.xml
@@ -31,7 +31,7 @@
<module>../org.eclipse.ote.ui.message.util</module>
<module>../org.eclipse.ote.ui.eviewer</module>
<module>../org.eclipse.ote.ui.message</module>
- <module>../org.eclipse.ote.ui.message.view</module>
+ <module>../org.eclipse.ote.ui.message.search</module>
<module>../org.eclipse.ote.ui.mux</module>
<module>../org.eclipse.ote.serverclient.feature</module>
diff --git a/org.eclipse.ote.ui.message.view/.classpath b/org.eclipse.ote.ui.message.search/.classpath
similarity index 100%
rename from org.eclipse.ote.ui.message.view/.classpath
rename to org.eclipse.ote.ui.message.search/.classpath
diff --git a/org.eclipse.ote.ui.message.view/.project b/org.eclipse.ote.ui.message.search/.project
similarity index 93%
rename from org.eclipse.ote.ui.message.view/.project
rename to org.eclipse.ote.ui.message.search/.project
index d3a186c..b8c808d 100644
--- a/org.eclipse.ote.ui.message.view/.project
+++ b/org.eclipse.ote.ui.message.search/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.ote.ui.message.view</name>
+ <name>org.eclipse.ote.ui.message.search</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.ote.ui.message.view/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ote.ui.message.search/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.ote.ui.message.view/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.ote.ui.message.search/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.ote.ui.message.view/META-INF/MANIFEST.MF b/org.eclipse.ote.ui.message.search/META-INF/MANIFEST.MF
similarity index 86%
rename from org.eclipse.ote.ui.message.view/META-INF/MANIFEST.MF
rename to org.eclipse.ote.ui.message.search/META-INF/MANIFEST.MF
index 0b11dd2..ae3b15f 100644
--- a/org.eclipse.ote.ui.message.view/META-INF/MANIFEST.MF
+++ b/org.eclipse.ote.ui.message.search/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: View
-Bundle-SymbolicName: org.eclipse.ote.ui.message.view;singleton:=true
+Bundle-SymbolicName: org.eclipse.ote.ui.message.search;singleton:=true
Bundle-Version: 0.11.0.qualifier
Require-Bundle: org.eclipse.ui;bundle-version="3.103.0",
org.eclipse.core.runtime
@@ -20,4 +20,4 @@
org.osgi.service.event
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/MessageInputConsumerComponent.xml
-Export-Package: org.eclipse.ote.ui.message.view
+Export-Package: org.eclipse.ote.ui.message.search
diff --git a/org.eclipse.ote.ui.message.search/OSGI-INF/MessageInputConsumerComponent.xml b/org.eclipse.ote.ui.message.search/OSGI-INF/MessageInputConsumerComponent.xml
new file mode 100644
index 0000000..5c4e10e
--- /dev/null
+++ b/org.eclipse.ote.ui.message.search/OSGI-INF/MessageInputConsumerComponent.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.ote.ui.message.search.messageinput">
+ <implementation class="org.eclipse.ote.ui.message.search.internal.MessageInputComponent"/>
+ <reference bind="addMessageInput" cardinality="0..n" interface="org.eclipse.ote.message.lookup.MessageInput" name="MessageInput" policy="dynamic" unbind="removeMessageInput"/>
+ <service>
+ <provide interface="org.eclipse.ote.ui.message.search.internal.MessageInputComponent"/>
+ </service>
+</scr:component>
diff --git a/org.eclipse.ote.ui.message.view/build.properties b/org.eclipse.ote.ui.message.search/build.properties
similarity index 100%
rename from org.eclipse.ote.ui.message.view/build.properties
rename to org.eclipse.ote.ui.message.search/build.properties
diff --git a/org.eclipse.ote.ui.message.view/images/collapse_state.gif b/org.eclipse.ote.ui.message.search/images/collapse_state.gif
similarity index 100%
rename from org.eclipse.ote.ui.message.view/images/collapse_state.gif
rename to org.eclipse.ote.ui.message.search/images/collapse_state.gif
Binary files differ
diff --git a/org.eclipse.ote.ui.message.view/images/expand_state.gif b/org.eclipse.ote.ui.message.search/images/expand_state.gif
similarity index 100%
rename from org.eclipse.ote.ui.message.view/images/expand_state.gif
rename to org.eclipse.ote.ui.message.search/images/expand_state.gif
Binary files differ
diff --git a/org.eclipse.ote.ui.message.view/images/gear.png b/org.eclipse.ote.ui.message.search/images/gear.png
similarity index 100%
rename from org.eclipse.ote.ui.message.view/images/gear.png
rename to org.eclipse.ote.ui.message.search/images/gear.png
Binary files differ
diff --git a/org.eclipse.ote.ui.message.view/images/glasses.gif b/org.eclipse.ote.ui.message.search/images/glasses.gif
similarity index 100%
rename from org.eclipse.ote.ui.message.view/images/glasses.gif
rename to org.eclipse.ote.ui.message.search/images/glasses.gif
Binary files differ
diff --git a/org.eclipse.ote.ui.message.view/images/pipe.png b/org.eclipse.ote.ui.message.search/images/pipe.png
similarity index 100%
rename from org.eclipse.ote.ui.message.view/images/pipe.png
rename to org.eclipse.ote.ui.message.search/images/pipe.png
Binary files differ
diff --git a/org.eclipse.ote.ui.message.view/plugin.xml b/org.eclipse.ote.ui.message.search/plugin.xml
similarity index 75%
rename from org.eclipse.ote.ui.message.view/plugin.xml
rename to org.eclipse.ote.ui.message.search/plugin.xml
index 54e92e8..9c5f5cb 100644
--- a/org.eclipse.ote.ui.message.view/plugin.xml
+++ b/org.eclipse.ote.ui.message.search/plugin.xml
@@ -9,16 +9,16 @@
<view
allowMultiple="false"
category="org.eclipse.ote.ui.messaging"
- class="org.eclipse.ote.ui.message.view.MessageSearchView"
+ class="org.eclipse.ote.ui.message.search.MessageSearchView"
icon="images/glasses.gif"
- id="org.eclipse.ote.ui.message.view.MessageSearchView"
+ id="org.eclipse.ote.ui.message.search.MessageSearchView"
name="Message Search"
restorable="true">
</view>
</extension>
<extension point="org.eclipse.osee.framework.ui.plugin.XNavigateItem">
<XNavigateItem
- classname="org.eclipse.ote.ui.message.view.internal.MessageNavigateViewItems"
+ classname="org.eclipse.ote.ui.message.search.internal.MessageNavigateViewItems"
category="Messaging"
viewId="org.eclipse.osee.ote.ui.navigate.OteNavigateView">
</XNavigateItem>
diff --git a/org.eclipse.ote.ui.message.view/pom.xml b/org.eclipse.ote.ui.message.search/pom.xml
similarity index 94%
rename from org.eclipse.ote.ui.message.view/pom.xml
rename to org.eclipse.ote.ui.message.search/pom.xml
index 2340ec0..4902ffc 100644
--- a/org.eclipse.ote.ui.message.view/pom.xml
+++ b/org.eclipse.ote.ui.message.search/pom.xml
@@ -10,7 +10,7 @@
<relativePath>../org.eclipse.ote.parent</relativePath>
</parent>
- <artifactId>org.eclipse.ote.ui.message.view</artifactId>
+ <artifactId>org.eclipse.ote.ui.message.search</artifactId>
<packaging>eclipse-plugin</packaging>
<name>Eclipse OTE UI Message View (Incubation)</name>
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageInfoComposite.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageInfoComposite.java
similarity index 98%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageInfoComposite.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageInfoComposite.java
index 4cac2a0..6ecaf36 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageInfoComposite.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageInfoComposite.java
@@ -1,9 +1,8 @@
-package org.eclipse.ote.ui.message.view;
+package org.eclipse.ote.ui.message.search;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
-
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -12,7 +11,7 @@
import org.eclipse.ote.message.lookup.MessageAssociationLookup;
import org.eclipse.ote.message.lookup.MessageLookup;
import org.eclipse.ote.message.lookup.MessageLookupResult;
-import org.eclipse.ote.ui.message.view.internal.MessageViewServiceUtility;
+import org.eclipse.ote.ui.message.search.internal.MessageViewServiceUtility;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageInfoSelectionListener.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageInfoSelectionListener.java
similarity index 77%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageInfoSelectionListener.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageInfoSelectionListener.java
index d1f905f..806d94e 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageInfoSelectionListener.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageInfoSelectionListener.java
@@ -1,4 +1,4 @@
-package org.eclipse.ote.ui.message.view;
+package org.eclipse.ote.ui.message.search;
public interface MessageInfoSelectionListener {
public void associatedClassSelected(String classname);
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageSearchView.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchView.java
similarity index 97%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageSearchView.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchView.java
index e671f28..d5a9d1b 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageSearchView.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchView.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.ote.ui.message.view;
+package org.eclipse.ote.ui.message.search;
import java.util.ArrayList;
import java.util.Collections;
@@ -18,7 +18,6 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Level;
-
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -37,11 +36,9 @@
import org.eclipse.ote.message.lookup.MessageInputItem;
import org.eclipse.ote.message.lookup.MessageInputUtil;
import org.eclipse.ote.message.lookup.MessageLookup;
+import org.eclipse.ote.ui.message.search.internal.MessageInputComponent;
+import org.eclipse.ote.ui.message.search.internal.MessageViewServiceUtility;
import org.eclipse.ote.ui.message.util.CheckedSelectionDialog;
-import org.eclipse.ote.ui.message.view.internal.MessageInputComponent;
-import org.eclipse.ote.ui.message.view.internal.MessageViewServiceUtility;
-import org.eclipse.ote.ui.message.view.search.MessageSearchViewContentProvider;
-import org.eclipse.ote.ui.message.view.search.MessageSearchViewLabelProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.events.MouseAdapter;
@@ -73,8 +70,8 @@
import org.eclipse.ui.part.ViewPart;
public class MessageSearchView extends ViewPart implements MessageInfoSelectionListener {
- public static final String VIEW_ID = "org.eclipse.ote.ui.message.view.MessageSearchView";
- public static final String PLUGIN_ID = "org.eclipse.ote.ui.message.view";
+ public static final String VIEW_ID = "org.eclipse.ote.ui.message.search.MessageSearchView";
+ public static final String PLUGIN_ID = "org.eclipse.ote.ui.message.search";
protected static final String SEARCHING_ALL_TYPES = "Current Filter:\nSearching All Message Types";
private TreeViewer treeViewer;
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/search/MessageSearchViewContentProvider.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchViewContentProvider.java
similarity index 96%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/search/MessageSearchViewContentProvider.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchViewContentProvider.java
index 865c899..427cadc 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/search/MessageSearchViewContentProvider.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchViewContentProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.ote.ui.message.view.search;
+package org.eclipse.ote.ui.message.search;
import java.util.List;
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/search/MessageSearchViewLabelProvider.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchViewLabelProvider.java
similarity index 94%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/search/MessageSearchViewLabelProvider.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchViewLabelProvider.java
index d9e42d4..bc941af 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/search/MessageSearchViewLabelProvider.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/MessageSearchViewLabelProvider.java
@@ -8,13 +8,12 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.ote.ui.message.view.search;
+package org.eclipse.ote.ui.message.search;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.ote.message.lookup.MessageInputItem;
-import org.eclipse.ote.ui.message.view.OteMessageViewImage;
import org.eclipse.swt.graphics.Image;
public class MessageSearchViewLabelProvider extends StyledCellLabelProvider {
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/OteMessageViewImage.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/OteMessageViewImage.java
similarity index 96%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/OteMessageViewImage.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/OteMessageViewImage.java
index 5ecab52..e01c4e5 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/OteMessageViewImage.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/OteMessageViewImage.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.ote.ui.message.view;
+package org.eclipse.ote.ui.message.search;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageInputComponent.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageInputComponent.java
similarity index 96%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageInputComponent.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageInputComponent.java
index 2a1f7fc..d8a6e55 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageInputComponent.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageInputComponent.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.ote.ui.message.view.internal;
+package org.eclipse.ote.ui.message.search.internal;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageNavigateViewItems.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageNavigateViewItems.java
similarity index 90%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageNavigateViewItems.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageNavigateViewItems.java
index 16a11ee..497ea63 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageNavigateViewItems.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageNavigateViewItems.java
@@ -8,15 +8,14 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.ote.ui.message.view.internal;
+package org.eclipse.ote.ui.message.search.internal;
import java.util.ArrayList;
import java.util.List;
-
import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateContainer;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.ote.ui.message.view.OteMessageViewImage;
+import org.eclipse.ote.ui.message.search.OteMessageViewImage;
public class MessageNavigateViewItems implements IXNavigateContainer {
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageSearchViewAction.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageSearchViewAction.java
similarity index 88%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageSearchViewAction.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageSearchViewAction.java
index c26e95b..b46634c 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageSearchViewAction.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageSearchViewAction.java
@@ -8,11 +8,11 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.ote.ui.message.view.internal;
+package org.eclipse.ote.ui.message.search.internal;
import org.eclipse.jface.action.Action;
import org.eclipse.osee.framework.ui.plugin.util.ViewPartUtil;
-import org.eclipse.ote.ui.message.view.MessageSearchView;
+import org.eclipse.ote.ui.message.search.MessageSearchView;
public class MessageSearchViewAction extends Action {
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageViewServiceUtility.java b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageViewServiceUtility.java
similarity index 97%
rename from org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageViewServiceUtility.java
rename to org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageViewServiceUtility.java
index 07ce06c..a7845a0 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/internal/MessageViewServiceUtility.java
+++ b/org.eclipse.ote.ui.message.search/src/org/eclipse/ote/ui/message/search/internal/MessageViewServiceUtility.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.ote.ui.message.view.internal;
+package org.eclipse.ote.ui.message.search.internal;
import java.util.logging.Level;
diff --git a/org.eclipse.ote.ui.message.view/OSGI-INF/MessageInputConsumerComponent.xml b/org.eclipse.ote.ui.message.view/OSGI-INF/MessageInputConsumerComponent.xml
deleted file mode 100644
index 4ed0558..0000000
--- a/org.eclipse.ote.ui.message.view/OSGI-INF/MessageInputConsumerComponent.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.ote.ui.message.view.messageinput">
- <implementation class="org.eclipse.ote.ui.message.view.internal.MessageInputComponent"/>
- <reference bind="addMessageInput" cardinality="0..n" interface="org.eclipse.ote.message.lookup.MessageInput" name="MessageInput" policy="dynamic" unbind="removeMessageInput"/>
- <service>
- <provide interface="org.eclipse.ote.ui.message.view.internal.MessageInputComponent"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.ote.ui.message/META-INF/MANIFEST.MF b/org.eclipse.ote.ui.message/META-INF/MANIFEST.MF
index 9bb5204..58c0e35 100644
--- a/org.eclipse.ote.ui.message/META-INF/MANIFEST.MF
+++ b/org.eclipse.ote.ui.message/META-INF/MANIFEST.MF
@@ -26,11 +26,11 @@
org.eclipse.ote.ui.message.watch
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.core.operation,
+ org.eclipse.osee.framework.jdk.core.type,
org.eclipse.ote.bytemessage,
org.eclipse.ote.message.lookup,
+ org.eclipse.ote.ui.message.search,
org.eclipse.ote.ui.message.util,
- org.eclipse.ote.ui.message.view,
org.eclipse.ote.ui.util
Service-Component: OSGI-INF/*.xml
diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/DetailsBox.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/DetailsBox.java
index dff2200..80aea95 100644
--- a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/DetailsBox.java
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/DetailsBox.java
@@ -15,7 +15,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
-
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
@@ -30,6 +29,8 @@
import org.eclipse.osee.ote.message.elements.ArrayElement;
import org.eclipse.osee.ote.message.elements.Element;
import org.eclipse.ote.ui.message.internal.WatchImages;
+import org.eclipse.ote.ui.message.search.MessageInfoComposite;
+import org.eclipse.ote.ui.message.search.MessageInfoSelectionListener;
import org.eclipse.ote.ui.message.tree.AbstractTreeNode;
import org.eclipse.ote.ui.message.tree.ElementNode;
import org.eclipse.ote.ui.message.tree.INodeVisitor;
@@ -37,8 +38,6 @@
import org.eclipse.ote.ui.message.tree.RootNode;
import org.eclipse.ote.ui.message.tree.WatchedElementNode;
import org.eclipse.ote.ui.message.tree.WatchedMessageNode;
-import org.eclipse.ote.ui.message.view.MessageInfoComposite;
-import org.eclipse.ote.ui.message.view.MessageInfoSelectionListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/MessageInfoSelectionHandler.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/MessageInfoSelectionHandler.java
index 9977590..fae423c 100644
--- a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/MessageInfoSelectionHandler.java
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/MessageInfoSelectionHandler.java
@@ -2,12 +2,11 @@
import java.util.ArrayList;
import java.util.logging.Level;
-
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.ote.message.tool.MessageMode;
+import org.eclipse.ote.ui.message.search.MessageInfoSelectionListener;
import org.eclipse.ote.ui.message.tree.WatchedMessageNode;
-import org.eclipse.ote.ui.message.view.MessageInfoSelectionListener;
import org.eclipse.ote.ui.message.watch.action.WatchElementAction;
public class MessageInfoSelectionHandler implements MessageInfoSelectionListener {
diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/WatchView.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/WatchView.java
index ac932a5..f68264e 100644
--- a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/WatchView.java
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/WatchView.java
@@ -28,6 +28,8 @@
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -43,6 +45,7 @@
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.osee.ote.client.msg.IOteMessageService;
+import org.eclipse.osee.ote.client.msg.core.IMessageSubscription;
import org.eclipse.osee.ote.message.MessageDefinitionProvider;
import org.eclipse.osee.ote.message.MessageProviderVersion;
import org.eclipse.osee.ote.message.interfaces.ITestEnvironmentMessageSystem;
@@ -365,6 +368,23 @@
}
}
});
+
+ treeViewer.addDoubleClickListener(new IDoubleClickListener(){
+
+ @Override
+ public void doubleClick(DoubleClickEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ Object element = selection.getFirstElement();
+ if(element instanceof ElementNode) {
+ WatchedMessageNode messageNode = getWatchList().getMessageNode(((ElementNode) element).getMessageName());
+ IMessageSubscription subscription = messageNode.getSubscription();
+ if(subscription.getMessageMode() == MessageMode.WRITER) {
+ ElementNode node = (ElementNode) element;
+ SetValueAction act = new SetValueAction(WatchView.this, node);
+ act.run();
+ }
+ }
+ }});
// Create menu, toolbars, filters, sorters.
createToolBar();
@@ -573,7 +593,10 @@
final FileDialog dialog = new FileDialog(treeViewer.getTree().getShell(), SWT.SAVE);
dialog.setFilterExtensions(new String[] {"*.mwi"});
if (saveFilePath == null) {
- saveFilePath = OseeData.getPath().toOSString();
+ saveFilePath = System.getProperty("user.home");
+ if(saveFilePath == null) {
+ saveFilePath = OseeData.getPath().toOSString();
+ }
}
if (lastSaveFileName == null) {
lastSaveFileName = "msgWatchItems.mwi";
