Changes related with zest version change.
authorzev <zev@radensolutions.com>
Fri, 8 Nov 2013 11:59:48 +0000 (13:59 +0200)
committerzev <zev@radensolutions.com>
Fri, 8 Nov 2013 11:59:48 +0000 (13:59 +0200)
17 files changed:
INSTALL
src/java/netxms-eclipse/NetworkMaps/META-INF/MANIFEST.MF
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/algorithms/ExpansionAlgorithm.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/algorithms/ManualLayout.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/algorithms/SparseTree.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/AbstractNetworkMapView.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/BendpointEditor.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/ExtendedGraphViewer.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/GraphLayoutFilter.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/MapContentProvider.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/MapLabelProvider.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/ZoomAction.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/widgets/NetworkMapWidget.java
src/java/netxms-eclipse/ServiceView/META-INF/MANIFEST.MF
src/java/netxms-eclipse/ServiceView/src/org/netxms/ui/eclipse/serviceview/widgets/ServiceTree.java
src/java/netxms-eclipse/ServiceView/src/org/netxms/ui/eclipse/serviceview/widgets/helpers/ServiceTreeContentProvider.java
src/java/netxms-eclipse/ServiceView/src/org/netxms/ui/eclipse/serviceview/widgets/helpers/ServiceTreeLabelProvider.java

diff --git a/INSTALL b/INSTALL
index 6e90e07..007e939 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
index 5338ae5..fbd81d2 100644 (file)
@@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.netxms.ui.eclipse.imagelibrary;bundle-version="1.2.10",
  org.netxms.ui.eclipse.osm;bundle-version="1.2.7",
  org.netxms.ui.eclipse.charts;bundle-version="1.2.9",
- org.eclipse.draw2d;bundle-version="3.9.0",
- org.eclipse.zest.core;bundle-version="2.0.0",
- org.eclipse.zest.jface;bundle-version="2.0.0",
- org.eclipse.zest.layouts;bundle-version="2.0.0",
+ org.eclipse.draw2d;bundle-version="3.9.0",  
+ org.eclipse.gef4.zest.core,
+ org.eclipse.gef4.zest.jface,
+ org.eclipse.gef4.zest.layouts,
  org.netxms.ui.eclipse.nxsl;bundle-version="1.2.7"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index 1b9f809..bf86d11 100644 (file)
@@ -8,10 +8,10 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import org.eclipse.zest.layouts.LayoutAlgorithm;
-import org.eclipse.zest.layouts.dataStructures.DisplayIndependentPoint;
-import org.eclipse.zest.layouts.interfaces.EntityLayout;
-import org.eclipse.zest.layouts.interfaces.LayoutContext;
+import org.eclipse.gef4.zest.layouts.LayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.dataStructures.DisplayIndependentPoint;
+import org.eclipse.gef4.zest.layouts.interfaces.EntityLayout;
+import org.eclipse.gef4.zest.layouts.interfaces.LayoutContext;
 
 /**
  * Graph expansion algorithm for overlay elimination
@@ -21,7 +21,7 @@ public class ExpansionAlgorithm implements LayoutAlgorithm
        private LayoutContext context;
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.layouts.LayoutAlgorithm#setLayoutContext(org.eclipse.zest.layouts.interfaces.LayoutContext)
+        * @see org.eclipse.gef4.zest.layouts.LayoutAlgorithm#setLayoutContext(org.eclipse.gef4.zest.layouts.interfaces.LayoutContext)
         */
        @Override
        public void setLayoutContext(LayoutContext context)
@@ -30,7 +30,7 @@ public class ExpansionAlgorithm implements LayoutAlgorithm
        }
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.layouts.LayoutAlgorithm#applyLayout(boolean)
+        * @see org.eclipse.gef4.zest.layouts.LayoutAlgorithm#applyLayout(boolean)
         */
        @Override
        public void applyLayout(boolean clean)
index 68692d8..371df49 100644 (file)
@@ -19,9 +19,9 @@
 package org.netxms.ui.eclipse.networkmaps.algorithms;
 
 import org.eclipse.swt.widgets.Item;
-import org.eclipse.zest.layouts.LayoutAlgorithm;
-import org.eclipse.zest.layouts.interfaces.EntityLayout;
-import org.eclipse.zest.layouts.interfaces.LayoutContext;
+import org.eclipse.gef4.zest.layouts.LayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.interfaces.EntityLayout;
+import org.eclipse.gef4.zest.layouts.interfaces.LayoutContext;
 import org.netxms.client.maps.elements.NetworkMapElement;
 
 /**
@@ -33,7 +33,7 @@ public class ManualLayout implements LayoutAlgorithm
        private LayoutContext context;
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.layouts.LayoutAlgorithm#setLayoutContext(org.eclipse.zest.layouts.interfaces.LayoutContext)
+        * @see org.eclipse.gef4.zest.layouts.LayoutAlgorithm#setLayoutContext(org.eclipse.gef4.zest.layouts.interfaces.LayoutContext)
         */
        @Override
        public void setLayoutContext(LayoutContext context)
@@ -42,7 +42,7 @@ public class ManualLayout implements LayoutAlgorithm
        }
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.layouts.LayoutAlgorithm#applyLayout(boolean)
+        * @see org.eclipse.gef4.zest.layouts.LayoutAlgorithm#applyLayout(boolean)
         */
        @Override
        public void applyLayout(boolean clean)
index 32324b8..74f193d 100644 (file)
@@ -21,9 +21,9 @@ package org.netxms.ui.eclipse.networkmaps.algorithms;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import org.eclipse.zest.layouts.LayoutAlgorithm;
-import org.eclipse.zest.layouts.interfaces.EntityLayout;
-import org.eclipse.zest.layouts.interfaces.LayoutContext;
+import org.eclipse.gef4.zest.layouts.LayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.interfaces.EntityLayout;
+import org.eclipse.gef4.zest.layouts.interfaces.LayoutContext;
 
 /**
  * Sparse tree (prevent node overlapping) after TreeLayout
@@ -37,7 +37,7 @@ public class SparseTree implements LayoutAlgorithm
        private LayoutContext context;
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.layouts.LayoutAlgorithm#setLayoutContext(org.eclipse.zest.layouts.interfaces.LayoutContext)
+        * @see org.eclipse.gef4.zest.layouts.LayoutAlgorithm#setLayoutContext(org.eclipse.gef4.zest.layouts.interfaces.LayoutContext)
         */
        @Override
        public void setLayoutContext(LayoutContext context)
@@ -46,7 +46,7 @@ public class SparseTree implements LayoutAlgorithm
        }
        
        /* (non-Javadoc)
-        * @see org.eclipse.zest.layouts.LayoutAlgorithm#applyLayout(boolean)
+        * @see org.eclipse.gef4.zest.layouts.LayoutAlgorithm#applyLayout(boolean)
         */
        @Override
        public void applyLayout(boolean clean)
index cd045f8..fd5f7bd 100644 (file)
@@ -62,17 +62,17 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PropertyDialogAction;
 import org.eclipse.ui.part.ViewPart;
-import org.eclipse.zest.core.viewers.AbstractZoomableViewer;
-import org.eclipse.zest.core.viewers.IZoomableWorkbenchPart;
-import org.eclipse.zest.core.widgets.Graph;
-import org.eclipse.zest.core.widgets.GraphConnection;
-import org.eclipse.zest.core.widgets.GraphNode;
-import org.eclipse.zest.layouts.LayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.CompositeLayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.GridLayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.RadialLayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.SpringLayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
+import org.eclipse.gef4.zest.core.viewers.AbstractZoomableViewer;
+import org.eclipse.gef4.zest.core.viewers.IZoomableWorkbenchPart;
+import org.eclipse.gef4.zest.core.widgets.Graph;
+import org.eclipse.gef4.zest.core.widgets.GraphConnection;
+import org.eclipse.gef4.zest.core.widgets.GraphNode;
+import org.eclipse.gef4.zest.layouts.LayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.CompositeLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.GridLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.RadialLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.SpringLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.TreeLayoutAlgorithm;
 import org.netxms.api.client.SessionListener;
 import org.netxms.api.client.SessionNotification;
 import org.netxms.client.NXCNotification;
@@ -1165,7 +1165,7 @@ public abstract class AbstractNetworkMapView extends ViewPart implements ISelect
        /*
         * (non-Javadoc)
         * 
-        * @see org.eclipse.zest.core.viewers.IZoomableWorkbenchPart#getZoomableViewer()
+        * @see org.eclipse.gef4.zest.core.viewers.IZoomableWorkbenchPart#getZoomableViewer()
         */
        @Override
        public AbstractZoomableViewer getZoomableViewer()
index d359fba..43d37cf 100644 (file)
@@ -33,7 +33,7 @@ import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.zest.core.widgets.GraphConnection;
+import org.eclipse.gef4.zest.core.widgets.GraphConnection;
 import org.netxms.client.maps.NetworkMapLink;
 
 /**
index 3a49a3e..63e9f9f 100644 (file)
@@ -48,12 +48,12 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.zest.core.viewers.GraphViewer;
-import org.eclipse.zest.core.viewers.internal.GraphModelEntityRelationshipFactory;
-import org.eclipse.zest.core.viewers.internal.IStylingGraphModelFactory;
-import org.eclipse.zest.core.widgets.GraphConnection;
-import org.eclipse.zest.core.widgets.custom.CGraphNode;
-import org.eclipse.zest.core.widgets.zooming.ZoomManager;
+import org.eclipse.gef4.zest.core.viewers.GraphViewer;
+import org.eclipse.gef4.zest.core.viewers.internal.GraphModelEntityRelationshipFactory;
+import org.eclipse.gef4.zest.core.viewers.internal.IStylingGraphModelFactory;
+import org.eclipse.gef4.zest.core.widgets.GraphConnection;
+import org.eclipse.gef4.zest.core.widgets.custom.CGraphNode;
+import org.eclipse.gef4.zest.core.widgets.zooming.ZoomManager;
 import org.netxms.base.GeoLocation;
 import org.netxms.client.maps.elements.NetworkMapDecoration;
 import org.netxms.ui.eclipse.jobs.ConsoleJob;
@@ -132,7 +132,7 @@ public class ExtendedGraphViewer extends GraphViewer
                getZoomManager().setZoomLevels(zoomLevels);
                
                for(Object f : rootLayer.getChildren())
-                       if (f.getClass().getName().equals("org.eclipse.zest.core.widgets.internal.ZestRootLayer")) //$NON-NLS-1$
+                       if (f.getClass().getName().equals("org.eclipse.gef4.zest.core.widgets.internal.ZestRootLayer")) //$NON-NLS-1$
                                zestRootLayer = (IFigure)f;
 
                final Runnable timer = new Runnable() {
@@ -260,7 +260,7 @@ public class ExtendedGraphViewer extends GraphViewer
        }
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.GraphViewer#inputChanged(java.lang.Object, java.lang.Object)
+        * @see org.eclipse.gef4.zest.core.viewers.GraphViewer#inputChanged(java.lang.Object, java.lang.Object)
         */
        @Override
        protected void inputChanged(Object input, Object oldInput)
@@ -334,7 +334,7 @@ public class ExtendedGraphViewer extends GraphViewer
        }
        
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.GraphViewer#setSelectionToWidget(java.util.List, boolean)
+        * @see org.eclipse.gef4.zest.core.viewers.GraphViewer#setSelectionToWidget(java.util.List, boolean)
         */
        @SuppressWarnings("rawtypes")
        @Override
@@ -359,7 +359,7 @@ public class ExtendedGraphViewer extends GraphViewer
        }
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.AbstractStructuredGraphViewer#getSelectionFromWidget()
+        * @see org.eclipse.gef4.zest.core.viewers.AbstractStructuredGraphViewer#getSelectionFromWidget()
         */
        @SuppressWarnings({ "rawtypes", "unchecked" })
        @Override
@@ -711,7 +711,7 @@ public class ExtendedGraphViewer extends GraphViewer
        }
        
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.GraphViewer#getFactory()
+        * @see org.eclipse.gef4.zest.core.viewers.GraphViewer#getFactory()
         */
        @Override
        protected IStylingGraphModelFactory getFactory()
index 6484353..220a5c1 100644 (file)
@@ -18,9 +18,9 @@
  */
 package org.netxms.ui.eclipse.networkmaps.views.helpers;
 
-import org.eclipse.zest.core.widgets.GraphItem;
-import org.eclipse.zest.core.widgets.GraphNode;
-import org.eclipse.zest.core.widgets.LayoutFilter;
+import org.eclipse.gef4.zest.core.widgets.GraphItem;
+import org.eclipse.gef4.zest.core.widgets.GraphNode;
+import org.eclipse.gef4.zest.core.widgets.LayoutFilter;
 import org.netxms.client.maps.elements.NetworkMapDecoration;
 
 /**
@@ -45,7 +45,7 @@ public class GraphLayoutFilter implements LayoutFilter
        }
        
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.widgets.LayoutFilter#isObjectFiltered(org.eclipse.zest.core.widgets.GraphItem)
+        * @see org.eclipse.gef4.zest.core.widgets.LayoutFilter#isObjectFiltered(org.eclipse.gef4.zest.core.widgets.GraphItem)
         */
        @Override
        public boolean isObjectFiltered(GraphItem item)
index fdce451..727b115 100644 (file)
@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.zest.core.viewers.IGraphEntityRelationshipContentProvider;
+import org.eclipse.gef4.zest.core.viewers.IGraphEntityRelationshipContentProvider;
 import org.netxms.client.NXCSession;
 import org.netxms.client.datacollection.DciValue;
 import org.netxms.client.maps.NetworkMapLink;
@@ -161,7 +161,7 @@ public class MapContentProvider implements IGraphEntityRelationshipContentProvid
        }
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.IGraphEntityRelationshipContentProvider#getRelationships(java.lang.Object, java.lang.Object)
+        * @see org.eclipse.gef4.zest.core.viewers.IGraphEntityRelationshipContentProvider#getRelationships(java.lang.Object, java.lang.Object)
         */
        @Override
        public Object[] getRelationships(Object source, Object dest)
index 6a1196f..9f9b0a8 100644 (file)
@@ -42,10 +42,10 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.zest.core.viewers.IFigureProvider;
-import org.eclipse.zest.core.viewers.ISelfStyleProvider;
-import org.eclipse.zest.core.widgets.GraphConnection;
-import org.eclipse.zest.core.widgets.GraphNode;
+import org.eclipse.gef4.zest.core.viewers.IFigureProvider;
+import org.eclipse.gef4.zest.core.viewers.ISelfStyleProvider;
+import org.eclipse.gef4.zest.core.widgets.GraphConnection;
+import org.eclipse.gef4.zest.core.widgets.GraphNode;
 import org.netxms.base.NXCommon;
 import org.netxms.client.NXCSession;
 import org.netxms.client.constants.Severity;
@@ -237,7 +237,7 @@ public class MapLabelProvider extends LabelProvider implements IFigureProvider,
         * (non-Javadoc)
         * 
         * @see
-        * org.eclipse.zest.core.viewers.IFigureProvider#getFigure(java.lang.Object)
+        * org.eclipse.gef4.zest.core.viewers.IFigureProvider#getFigure(java.lang.Object)
         */
        @Override
        public IFigure getFigure(Object element)
@@ -392,8 +392,8 @@ public class MapLabelProvider extends LabelProvider implements IFigureProvider,
         * (non-Javadoc)
         * 
         * @see
-        * org.eclipse.zest.core.viewers.ISelfStyleProvider#selfStyleConnection(java
-        * .lang.Object, org.eclipse.zest.core.widgets.GraphConnection)
+        * org.eclipse.gef4.zest.core.viewers.ISelfStyleProvider#selfStyleConnection(java
+        * .lang.Object, org.eclipse.gef4.zest.core.widgets.GraphConnection)
         */
        @Override
        public void selfStyleConnection(Object element, GraphConnection connection)
@@ -544,7 +544,7 @@ public class MapLabelProvider extends LabelProvider implements IFigureProvider,
        }
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.ISelfStyleProvider#selfStyleNode(java.lang.Object, org.eclipse.zest.core.widgets.GraphNode)
+        * @see org.eclipse.gef4.zest.core.viewers.ISelfStyleProvider#selfStyleNode(java.lang.Object, org.eclipse.gef4.zest.core.widgets.GraphNode)
         */
        @Override
        public void selfStyleNode(Object element, GraphNode node)
index fea469e..58ef968 100644 (file)
@@ -19,8 +19,8 @@
 package org.netxms.ui.eclipse.networkmaps.views.helpers;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.zest.core.widgets.zooming.ZoomListener;
-import org.eclipse.zest.core.widgets.zooming.ZoomManager;
+import org.eclipse.gef4.zest.core.widgets.zooming.ZoomListener;
+import org.eclipse.gef4.zest.core.widgets.zooming.ZoomManager;
 
 /**
  * Zoom action
@@ -45,7 +45,7 @@ public class ZoomAction extends Action implements ZoomListener
        }
        
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.internal.ZoomListener#zoomChanged(double)
+        * @see org.eclipse.gef4.zest.core.viewers.internal.ZoomListener#zoomChanged(double)
         */
        @Override
        public void zoomChanged(double zoom)
index 7429f81..9f37471 100644 (file)
@@ -27,12 +27,12 @@ import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.zest.layouts.LayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.CompositeLayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.GridLayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.RadialLayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.SpringLayoutAlgorithm;
-import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.LayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.CompositeLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.GridLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.RadialLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.SpringLayoutAlgorithm;
+import org.eclipse.gef4.zest.layouts.algorithms.TreeLayoutAlgorithm;
 import org.netxms.base.NXCommon;
 import org.netxms.client.maps.NetworkMapLink;
 import org.netxms.client.maps.NetworkMapPage;
index f1ce902..3c2068f 100644 (file)
@@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.netxms.ui.eclipse.console;bundle-version="1.2.10",
  org.netxms.ui.eclipse.networkmaps;bundle-version="1.2.10",
- org.eclipse.zest.core;bundle-version="2.0.0",
- org.eclipse.zest.jface;bundle-version="2.0.0",
- org.eclipse.zest.layouts;bundle-version="2.0.0",
+ org.eclipse.gef4.zest.core,
+ org.eclipse.gef4.zest.jface,
+ org.eclipse.gef4.zest.layouts,
  org.eclipse.draw2d;bundle-version="3.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index d84d8bb..d971975 100644 (file)
@@ -22,8 +22,8 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.zest.core.viewers.GraphViewer;
-import org.eclipse.zest.layouts.algorithms.SpaceTreeLayoutAlgorithm;
+import org.eclipse.gef4.zest.core.viewers.GraphViewer;
+import org.eclipse.gef4.zest.layouts.algorithms.SpaceTreeLayoutAlgorithm;
 import org.netxms.client.NXCSession;
 import org.netxms.client.objects.AbstractObject;
 import org.netxms.ui.eclipse.serviceview.widgets.helpers.IServiceFigureListener;
@@ -74,7 +74,9 @@ public class ServiceTree extends Composite implements IServiceFigureListener
                });
                */
                //viewer.setLayoutAlgorithm(new CompositeLayoutAlgorithm(new LayoutAlgorithm[] { mainLayoutAlgorithm, new SparseTree() }));
-               viewer.setLayoutAlgorithm(new SpaceTreeLayoutAlgorithm(SpaceTreeLayoutAlgorithm.TOP_DOWN));
+               
+               //viewer.setLayoutAlgorithm(new SpaceTreeLayoutAlgorithm(SpaceTreeLayoutAlgorithm.TOP_DOWN)); 
+               //FIXME No more setLayoutAlgorithm in zest. 
                
                model = new ServiceTreeModel(rootObject);
                viewer.setInput(model);
index 34f0686..b874bd2 100644 (file)
@@ -19,7 +19,7 @@
 package org.netxms.ui.eclipse.serviceview.widgets.helpers;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.zest.core.viewers.IGraphEntityContentProvider;
+import org.eclipse.gef4.zest.core.viewers.IGraphEntityContentProvider;
 
 /**
  * Content provider for service tree
@@ -28,7 +28,7 @@ import org.eclipse.zest.core.viewers.IGraphEntityContentProvider;
 public class ServiceTreeContentProvider implements IGraphEntityContentProvider
 {
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.IGraphEntityContentProvider#getConnectedTo(java.lang.Object)
+        * @see org.eclipse.gef4.zest.core.viewers.IGraphEntityContentProvider#getConnectedTo(java.lang.Object)
         */
        @Override
        public Object[] getConnectedTo(Object entity)
@@ -37,7 +37,7 @@ public class ServiceTreeContentProvider implements IGraphEntityContentProvider
        }
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.IGraphEntityContentProvider#getElements(java.lang.Object)
+        * @see org.eclipse.gef4.zest.core.viewers.IGraphEntityContentProvider#getElements(java.lang.Object)
         */
        @Override
        public Object[] getElements(Object inputElement)
index 1360fd2..c5e5233 100644 (file)
@@ -27,8 +27,8 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.zest.core.viewers.GraphViewer;
-import org.eclipse.zest.core.viewers.IFigureProvider;
+import org.eclipse.gef4.zest.core.viewers.GraphViewer;
+import org.eclipse.gef4.zest.core.viewers.IFigureProvider;
 import org.netxms.ui.eclipse.serviceview.Activator;
 
 /**
@@ -91,7 +91,7 @@ public class ServiceTreeLabelProvider extends LabelProvider implements IFigurePr
        }
 
        /* (non-Javadoc)
-        * @see org.eclipse.zest.core.viewers.IFigureProvider#getFigure(java.lang.Object)
+        * @see org.eclipse.gef4.zest.core.viewers.IFigureProvider#getFigure(java.lang.Object)
         */
        @Override
        public IFigure getFigure(Object element)