fixed keyboard shortcuts in agent file viewer; fixed exception in tabbed object view
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 23 Sep 2016 08:13:31 +0000 (11:13 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 23 Sep 2016 08:13:31 +0000 (11:13 +0300)
src/java/netxms-eclipse/FileManager/plugin.xml
src/java/netxms-eclipse/ObjectView/src/org/netxms/ui/eclipse/objectview/views/TabbedObjectView.java
webui/webapp/FileManager/plugin.xml
webui/webapp/ObjectView/src/org/netxms/ui/eclipse/objectview/views/TabbedObjectView.java

index 75409ba..09a9bc9 100644 (file)
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.select_all"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="M1+A">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.copy"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="M1+C">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.clear_output"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="M1+L">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.scroll_lock"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="PAUSE">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.find"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="M1+F">
       </key>
             parentId="org.eclipse.ui.contexts.window">
       </context>
       <context
-            id="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            id="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             name="Agent File Viewer"
             parentId="org.eclipse.ui.contexts.window">
       </context>
index 57a5bf1..73d1037 100644 (file)
@@ -274,6 +274,8 @@ public class TabbedObjectView extends ViewPart
         */
        private void onObjectUpdate(AbstractObject object)
        {
+          if (header.isDisposed())
+             return;
                header.setText(object.getObjectName());
                for(final ObjectTab tab : tabs)
                {
index b83f849..09a9bc9 100644 (file)
             name="%command.name.ServerFileList">
       </command>
       <command
+            description="Toggle Filter"
             id="org.netxms.ui.eclipse.filemanager.commands.showFilter"
-            name="Show filter">
+            name="Toggle Filter">
       </command>
       <command
             id="org.netxms.ui.eclipse.filemanager.commands.refreshFolder"
             id="org.netxms.ui.eclipse.filemanager.commands.find"
             name="Find">
       </command>
-      <command
-            description="Toggle Filter"
-            id="org.netxms.ui.eclipse.filemanager.commands.showFilter"
-            name="Toggle Filter">
-      </command>
    </extension>
    <extension
          point="org.eclipse.ui.actionSets">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.select_all"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="M1+A">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.copy"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="M1+C">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.clear_output"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="M1+L">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.scroll_lock"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="PAUSE">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.filemanager.commands.find"
-            contextId="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            contextId="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
             sequence="M1+F">
       </key>
             parentId="org.eclipse.ui.contexts.window">
       </context>
       <context
-            id="org.netxms.ui.eclipse.filemanager.context.FileManager"
+            id="org.netxms.ui.eclipse.filemanager.context.AgentFileViewer"
             name="Agent File Viewer"
             parentId="org.eclipse.ui.contexts.window">
       </context>
index f355f53..072d0d9 100644 (file)
@@ -273,6 +273,8 @@ public class TabbedObjectView extends ViewPart
         */
        private void onObjectUpdate(AbstractObject object)
        {
+          if (header.isDisposed())
+             return;
                header.setText(object.getObjectName());
                for(final ObjectTab tab : tabs)
                {