minor fixes
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 15 Apr 2013 15:56:00 +0000 (15:56 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 15 Apr 2013 15:56:00 +0000 (15:56 +0000)
36 files changed:
COPYING
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/ShowObjectAlarms.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/dialogs/EditColumnDialog.java
webui/webapp/ActionManager/build.properties
webui/webapp/AgentManager/build.properties
webui/webapp/AlarmViewer/build.properties
webui/webapp/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/ShowObjectAlarms.java
webui/webapp/Charts/build.properties
webui/webapp/Charts/src/org/netxms/ui/eclipse/charts/widgets/LineChart.java
webui/webapp/Core/build.properties
webui/webapp/Dashboard/build.properties
webui/webapp/DataCollection/build.properties
webui/webapp/DataCollection/src/org/netxms/ui/eclipse/datacollection/dialogs/EditColumnDialog.java
webui/webapp/EPP/build.properties
webui/webapp/EventManager/build.properties
webui/webapp/FileManager/build.properties
webui/webapp/ImageLibrary/build.properties
webui/webapp/LogViewer/build.properties
webui/webapp/NXSL/build.properties
webui/webapp/OSM/build.properties
webui/webapp/ObjectBrowser/build.properties
webui/webapp/ObjectManager/build.properties
webui/webapp/ObjectTools/build.properties
webui/webapp/ObjectView/build.properties
webui/webapp/PerfView/build.properties
webui/webapp/Reporter/build.properties
webui/webapp/SLM/build.properties
webui/webapp/SNMP/build.properties
webui/webapp/ServerConfig/build.properties
webui/webapp/ServerJobManager/build.properties
webui/webapp/ServiceView/build.properties
webui/webapp/SwitchManager/build.properties
webui/webapp/Topology/build.properties
webui/webapp/UserManager/build.properties
webui/webapp/swtchart/build.properties
webui/webapp/swtchart/src/org/swtchart/internal/Util.java

diff --git a/COPYING b/COPYING
index 43c49fa..af3354d 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -43,10 +43,7 @@ Third party components bundled with NetXMS:
 
 freetype        BSD-like
 libexpat        BSD-like
-libgd           BSD-like
 libipfix        LGPL
-libjpeg         BSD-like
-libpng          BSD-like
 libtre          BSD-like
 scilexer        BSD-like
 sqlite          BSD-like
index e0fbee2..0150791 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2012 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -26,14 +26,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;\r
 import org.eclipse.ui.IWorkbenchWindow;\r
 import org.eclipse.ui.PartInitException;\r
-import org.netxms.client.objects.AbstractNode;\r
 import org.netxms.client.objects.AbstractObject;\r
-import org.netxms.client.objects.Cluster;\r
-import org.netxms.client.objects.Container;\r
-import org.netxms.client.objects.EntireNetwork;\r
-import org.netxms.client.objects.ServiceRoot;\r
-import org.netxms.client.objects.Subnet;\r
-import org.netxms.client.objects.Zone;\r
 import org.netxms.ui.eclipse.alarmviewer.Messages;\r
 import org.netxms.ui.eclipse.alarmviewer.views.ObjectAlarmBrowser;\r
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;\r
@@ -85,10 +78,7 @@ public class ShowObjectAlarms implements IObjectActionDelegate
                    (((IStructuredSelection)selection).size() == 1))\r
                {\r
                        obj = ((IStructuredSelection)selection).getFirstElement();\r
-                       if((obj instanceof AbstractNode) || (obj instanceof Container) ||\r
-                               (obj instanceof Subnet) || (obj instanceof Cluster) ||\r
-                               (obj instanceof EntireNetwork) || (obj instanceof ServiceRoot) ||\r
-                               (obj instanceof Zone))\r
+                       if (obj instanceof AbstractObject)\r
                        {\r
                                object = (AbstractObject)obj;\r
                        }\r
index f10b902..d6a6a9a 100644 (file)
@@ -9,7 +9,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;\r
 import org.netxms.client.datacollection.ColumnDefinition;\r
 import org.netxms.ui.eclipse.datacollection.Messages;\r
-import org.netxms.ui.eclipse.nxsl.widgets.ScriptEditor;\r
 \r
 /**\r
  * Column definition editing dialog\r
@@ -17,7 +16,6 @@ import org.netxms.ui.eclipse.nxsl.widgets.ScriptEditor;
 public class EditColumnDialog extends Dialog\r
 {\r
        private ColumnDefinition column;\r
-       private ScriptEditor transformationScript; \r
        \r
        /**\r
         * @param parentShell\r
index 58cc95e..6e28199 100644 (file)
@@ -5,7 +5,3 @@ bin.includes = META-INF/,\
                plugin.xml,\\r
                icons/,\\r
                OSGI-INF/\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/,\\r
-               OSGI-INF/.svn/,\\r
-               OSGI-INF/l10n/.svn/\r
index fb88b27..e48eb04 100644 (file)
@@ -5,7 +5,3 @@ bin.includes = .,\
                META-INF/,\\r
                icons/,\\r
                OSGI-INF/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/,\\r
-               OSGI-INF/.svn/,\\r
-               OSGI-INF/l10n/.svn/\r
index a53e488..e42e15f 100644 (file)
@@ -5,7 +5,3 @@ bin.includes = plugin.xml,\
                .,\\r
                icons/,\\r
                OSGI-INF/\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/,\\r
-               OSGI-INF/.svn/,\\r
-               OSGI-INF/l10n/.svn/\r
index 92a114f..f7dd21c 100644 (file)
@@ -1,6 +1,6 @@
 /**\r
  * NetXMS - open source network management system\r
- * Copyright (C) 2003-2012 Victor Kirhenshtein\r
+ * Copyright (C) 2003-2013 Victor Kirhenshtein\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -26,14 +26,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;\r
 import org.eclipse.ui.IWorkbenchWindow;\r
 import org.eclipse.ui.PartInitException;\r
-import org.netxms.client.objects.AbstractNode;\r
 import org.netxms.client.objects.AbstractObject;\r
-import org.netxms.client.objects.Cluster;\r
-import org.netxms.client.objects.Container;\r
-import org.netxms.client.objects.EntireNetwork;\r
-import org.netxms.client.objects.ServiceRoot;\r
-import org.netxms.client.objects.Subnet;\r
-import org.netxms.client.objects.Zone;\r
 import org.netxms.ui.eclipse.alarmviewer.Messages;\r
 import org.netxms.ui.eclipse.alarmviewer.views.ObjectAlarmBrowser;\r
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;\r
@@ -85,10 +78,7 @@ public class ShowObjectAlarms implements IObjectActionDelegate
                    (((IStructuredSelection)selection).size() == 1))\r
                {\r
                        obj = ((IStructuredSelection)selection).getFirstElement();\r
-                       if((obj instanceof AbstractNode) || (obj instanceof Container) ||\r
-                               (obj instanceof Subnet) || (obj instanceof Cluster) ||\r
-                               (obj instanceof EntireNetwork) || (obj instanceof ServiceRoot) ||\r
-                               (obj instanceof Zone))\r
+                       if (obj instanceof AbstractObject)\r
                        {\r
                                object = (AbstractObject)obj;\r
                        }\r
index 505da45..b26fb31 100644 (file)
@@ -4,6 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                OSGI-INF/\r
-bin.excludes = META-INF/.svn/,\\r
-               OSGI-INF/.svn/,\\r
-               OSGI-INF/l10n/.svn/\r
index c8c8426..8a2f80f 100644 (file)
@@ -261,6 +261,8 @@ public class LineChart extends Chart implements HistoricalDataChart
                \r
                final Composite plotArea = getPlotArea();\r
                moveListener = new MouseMoveListener() {\r
+                       private static final long serialVersionUID = 1L;\r
+\r
                        @Override\r
                        public void mouseMove(MouseEvent e)\r
                        {\r
index 66bda7b..1e6f110 100644 (file)
@@ -10,10 +10,3 @@ bin.includes = plugin.xml,\
                jar/netxms-base-1.2.7.jar,\\r
                jar/netxms-client-1.2.7.jar,\\r
                jar/netxms-client-api-1.2.7.jar\r
-bin.excludes = META-INF/.svn/,\\r
-               OSGI-INF/.svn/,\\r
-               OSGI-INF/l10n/.svn/,\\r
-               icons/.svn/,\\r
-               icons/status/.svn/,\\r
-               theme/.svn/,\\r
-               theme/resources/.svn/\r
index ac74dd9..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 9b8de6f..9b290b0 100644 (file)
@@ -9,7 +9,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;\r
 import org.netxms.client.datacollection.ColumnDefinition;\r
 import org.netxms.ui.eclipse.datacollection.Messages;\r
-import org.netxms.ui.eclipse.nxsl.widgets.ScriptEditor;\r
 \r
 /**\r
  * Column definition editing dialog\r
@@ -19,7 +18,6 @@ public class EditColumnDialog extends Dialog
        private static final long serialVersionUID = 1L;\r
 \r
        private ColumnDefinition column;\r
-       private ScriptEditor transformationScript; \r
        \r
        /**\r
         * @param parentShell\r
index ac74dd9..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/\r
index ac74dd9..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index ac74dd9..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/\r
index 4e707b1..947baa0 100644 (file)
@@ -5,5 +5,3 @@ bin.includes = META-INF/,\
                plugin.xml,\\r
                icons/,\\r
                resource.properties\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 03b8572..4b8162a 100644 (file)
@@ -4,6 +4,3 @@ bin.includes = plugin.xml,\
                META-INF/,\\r
                .,\\r
                icons/\r
-bin.excludes = icons/.svn/,\\r
-               icons/status/.svn/,\\r
-               META-INF/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 3422955..ef15ea8 100644 (file)
@@ -5,6 +5,3 @@ bin.includes = META-INF/,\
                plugin.xml,\\r
                icons/,\\r
                schema/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/,\\r
-               schema/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 67eacaf..285b8bf 100644 (file)
@@ -4,4 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = icons/.svn/\r
index ac74dd9..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index 71da832..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = META-INF/.svn/,\\r
-               icons/.svn/\r
index ac74dd9..285b8bf 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                icons/\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/\r
index f8f62c0..290babb 100644 (file)
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
                .,\\r
                icons/,\\r
                plugin.xml\r
-bin.excludes = icons/.svn/,\\r
-               META-INF/.svn/\r
index 7be1f25..41eb6ad 100644 (file)
@@ -2,4 +2,3 @@ source.. = src/
 output.. = bin/\r
 bin.includes = META-INF/,\\r
                .\r
-bin.excludes = META-INF/.svn/\r
index 448a916..54b5c91 100644 (file)
@@ -13,6 +13,7 @@ import org.eclipse.swt.graphics.Point;
 /**\r
  * A utility class providing generic methods.\r
  */\r
+@SuppressWarnings("deprecation")\r
 public final class Util\r
 {\r
        /**\r