From: G S Senthil Kumar Date: Tue, 9 Feb 2016 14:35:28 +0000 (+0530) Subject: Updated the order of imports in the source files of simulator plugins. X-Git-Tag: 1.2.0+RC1~580^2^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2b47c415c84402c1289ff0cae28cae46a72a55f;p=platform%2Fupstream%2Fiotivity.git Updated the order of imports in the source files of simulator plugins. Re-organized the imports section in both plugins to follow an uniform order as specified in the coding guidelines. Change-Id: I816aee842c7fd6cdfab32c35d0d4916491ccd081 Signed-off-by: G S Senthil Kumar Reviewed-on: https://gerrit.iotivity.org/gerrit/4965 Tested-by: jenkins-iotivity Reviewed-by: Radha Bhavani Reviewed-by: Madan Lanka --- diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/Activator.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/Activator.java index 5f22400..c23f76b 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/Activator.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/Activator.java @@ -16,13 +16,13 @@ package oic.simulator.clientcontroller; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + import oic.simulator.clientcontroller.manager.ImageManager; import oic.simulator.clientcontroller.manager.LogManager; import oic.simulator.clientcontroller.manager.ResourceManager; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - /** * The activator class controls the plug-in life cycle. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ImageManager.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ImageManager.java index cb7f17e..a8a6842 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ImageManager.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ImageManager.java @@ -16,16 +16,16 @@ package oic.simulator.clientcontroller.manager; -import java.net.URL; - -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.utils.Constants; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; import org.osgi.framework.Bundle; +import java.net.URL; + +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.utils.Constants; + /** * Class which loads the icons/images into the image registry, and has methods * to handle the image related requests from other UI modules. diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/LogManager.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/LogManager.java index 03700e4..96117c6 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/LogManager.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/LogManager.java @@ -16,23 +16,24 @@ package oic.simulator.clientcontroller.manager; +import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.swt.graphics.Image; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.LinkedList; +import org.oic.simulator.ILogger; +import org.oic.simulator.ILogger.Level; +import org.oic.simulator.SimulatorManager; + import oic.simulator.clientcontroller.Activator; import oic.simulator.clientcontroller.listener.ILogUIListener; import oic.simulator.clientcontroller.utils.Constants; import oic.simulator.logger.LogEntry; import oic.simulator.logger.LoggerCallback; -import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.swt.graphics.Image; -import org.oic.simulator.ILogger; -import org.oic.simulator.ILogger.Level; -import org.oic.simulator.SimulatorManager; - /** * Class which handles the native logs, maintains log entries and updates the * UI. diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ResourceManager.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ResourceManager.java index 0b6b3a3..0425477 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ResourceManager.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ResourceManager.java @@ -28,14 +28,6 @@ import java.util.Map; import java.util.Set; import java.util.Vector; -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.remoteresource.DeviceAndPlatformInfo; -import oic.simulator.clientcontroller.remoteresource.MetaProperty; -import oic.simulator.clientcontroller.remoteresource.RemoteResource; -import oic.simulator.clientcontroller.utils.AttributeValueStringConverter; -import oic.simulator.clientcontroller.utils.Constants; -import oic.simulator.clientcontroller.utils.Utility; - import org.oic.simulator.ArrayProperty; import org.oic.simulator.AttributeProperty; import org.oic.simulator.AttributeProperty.Type; @@ -65,6 +57,14 @@ import org.oic.simulator.client.SimulatorRemoteResource.PutResponseListener; import org.oic.simulator.client.SimulatorRemoteResource.VerificationListener; import org.oic.simulator.client.SimulatorRemoteResource.VerificationType; +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.remoteresource.DeviceAndPlatformInfo; +import oic.simulator.clientcontroller.remoteresource.MetaProperty; +import oic.simulator.clientcontroller.remoteresource.RemoteResource; +import oic.simulator.clientcontroller.utils.AttributeValueStringConverter; +import oic.simulator.clientcontroller.utils.Constants; +import oic.simulator.clientcontroller.utils.Utility; + /** * This class acts as an interface between the simulator java SDK and the * various UI modules. It maintains all the details of resources and provides diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/perspective/PerspectiveFactory.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/perspective/PerspectiveFactory.java index 527e460..2658a46 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/perspective/PerspectiveFactory.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/perspective/PerspectiveFactory.java @@ -16,15 +16,15 @@ package oic.simulator.clientcontroller.perspective; +import org.eclipse.ui.IPageLayout; +import org.eclipse.ui.IPerspectiveFactory; + import oic.simulator.clientcontroller.view.AttributeView; import oic.simulator.clientcontroller.view.LogView; import oic.simulator.clientcontroller.view.MetaPropertiesView; import oic.simulator.clientcontroller.view.MultiResourceOrchestrationView; import oic.simulator.clientcontroller.view.ResourceManagerView; -import org.eclipse.ui.IPageLayout; -import org.eclipse.ui.IPerspectiveFactory; - /** * This class creates a new eclipse perspective for client controller and * positions the different views inside. diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/AttributeElement.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/AttributeElement.java index ff992ff..c17c57e 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/AttributeElement.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/AttributeElement.java @@ -19,8 +19,6 @@ package oic.simulator.clientcontroller.remoteresource; import java.util.HashMap; import java.util.Map; -import oic.simulator.clientcontroller.utils.AttributeValueStringConverter; - import org.oic.simulator.ArrayProperty; import org.oic.simulator.AttributeProperty; import org.oic.simulator.AttributeValue; @@ -29,6 +27,8 @@ import org.oic.simulator.ModelProperty; import org.oic.simulator.SimulatorResourceAttribute; import org.oic.simulator.SimulatorResourceModel; +import oic.simulator.clientcontroller.utils.AttributeValueStringConverter; + public class AttributeElement { private Object mParent = null; private SimulatorResourceAttribute mAttribute = null; diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/RemoteResource.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/RemoteResource.java index c0b03cb..4c7d6d5 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/RemoteResource.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/RemoteResource.java @@ -16,11 +16,11 @@ package oic.simulator.clientcontroller.remoteresource; -import oic.simulator.clientcontroller.utils.Constants; - import org.oic.simulator.SimulatorResourceModel; import org.oic.simulator.client.SimulatorRemoteResource; +import oic.simulator.clientcontroller.utils.Constants; + /** * This class represents a remote resource. It maintains all the necessary * information about the resource. diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/utils/Utility.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/utils/Utility.java index cb731b9..4f41e9c 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/utils/Utility.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/utils/Utility.java @@ -25,9 +25,9 @@ import java.util.Map; import java.util.Set; import org.oic.simulator.AttributeValue; -import org.oic.simulator.SimulatorException; import org.oic.simulator.AttributeValue.TypeInfo; import org.oic.simulator.AttributeValue.ValueType; +import org.oic.simulator.SimulatorException; /** * This class has common utility methods. diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeEditingSupport.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeEditingSupport.java index eec9622..4c33cd8 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeEditingSupport.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeEditingSupport.java @@ -16,16 +16,6 @@ package oic.simulator.clientcontroller.view; -import java.util.List; - -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.manager.ResourceManager; -import oic.simulator.clientcontroller.remoteresource.AttributeElement; -import oic.simulator.clientcontroller.remoteresource.RemoteResource; -import oic.simulator.clientcontroller.utils.AttributeValueBuilder; -import oic.simulator.clientcontroller.utils.Utility; -import oic.simulator.clientcontroller.view.dialogs.PostRequestDialog; - import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CheckboxCellEditor; @@ -40,12 +30,23 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; + +import java.util.List; + import org.oic.simulator.AttributeValue; import org.oic.simulator.AttributeValue.TypeInfo; import org.oic.simulator.AttributeValue.ValueType; import org.oic.simulator.InvalidArgsException; import org.oic.simulator.SimulatorResourceAttribute; +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.manager.ResourceManager; +import oic.simulator.clientcontroller.remoteresource.AttributeElement; +import oic.simulator.clientcontroller.remoteresource.RemoteResource; +import oic.simulator.clientcontroller.utils.AttributeValueBuilder; +import oic.simulator.clientcontroller.utils.Utility; +import oic.simulator.clientcontroller.view.dialogs.PostRequestDialog; + /** * This class provides editing support to the resources attributes table in the * attributes view. diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeView.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeView.java index acac4c8..04ff981 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeView.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeView.java @@ -16,29 +16,6 @@ package oic.simulator.clientcontroller.view; -import java.util.Date; -import java.util.Map; - -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.listener.IConfigurationUpload; -import oic.simulator.clientcontroller.listener.IGetUIListener; -import oic.simulator.clientcontroller.listener.IObserveUIListener; -import oic.simulator.clientcontroller.listener.IPostUIListener; -import oic.simulator.clientcontroller.listener.IPutUIListener; -import oic.simulator.clientcontroller.listener.IResourceSelectionChangedUIListener; -import oic.simulator.clientcontroller.listener.IVerificationUIListener; -import oic.simulator.clientcontroller.manager.ResourceManager; -import oic.simulator.clientcontroller.manager.UiListenerHandler; -import oic.simulator.clientcontroller.remoteresource.AttributeElement; -import oic.simulator.clientcontroller.remoteresource.RemoteResource; -import oic.simulator.clientcontroller.remoteresource.ResourceRepresentation; -import oic.simulator.clientcontroller.utils.Constants; -import oic.simulator.clientcontroller.utils.Utility; -import oic.simulator.clientcontroller.view.dialogs.GetRequestDialog; -import oic.simulator.clientcontroller.view.dialogs.PostRequestDialog; -import oic.simulator.clientcontroller.view.dialogs.PutRequestDialog; -import oic.simulator.clientcontroller.view.dialogs.VerificationDialog; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; @@ -61,12 +38,36 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; + +import java.util.Date; +import java.util.Map; + import org.oic.simulator.AttributeValue.ValueType; import org.oic.simulator.ILogger.Level; import org.oic.simulator.SimulatorResourceAttribute; import org.oic.simulator.client.SimulatorRemoteResource; import org.oic.simulator.client.SimulatorRemoteResource.VerificationType; +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.listener.IConfigurationUpload; +import oic.simulator.clientcontroller.listener.IGetUIListener; +import oic.simulator.clientcontroller.listener.IObserveUIListener; +import oic.simulator.clientcontroller.listener.IPostUIListener; +import oic.simulator.clientcontroller.listener.IPutUIListener; +import oic.simulator.clientcontroller.listener.IResourceSelectionChangedUIListener; +import oic.simulator.clientcontroller.listener.IVerificationUIListener; +import oic.simulator.clientcontroller.manager.ResourceManager; +import oic.simulator.clientcontroller.manager.UiListenerHandler; +import oic.simulator.clientcontroller.remoteresource.AttributeElement; +import oic.simulator.clientcontroller.remoteresource.RemoteResource; +import oic.simulator.clientcontroller.remoteresource.ResourceRepresentation; +import oic.simulator.clientcontroller.utils.Constants; +import oic.simulator.clientcontroller.utils.Utility; +import oic.simulator.clientcontroller.view.dialogs.GetRequestDialog; +import oic.simulator.clientcontroller.view.dialogs.PostRequestDialog; +import oic.simulator.clientcontroller.view.dialogs.PutRequestDialog; +import oic.simulator.clientcontroller.view.dialogs.VerificationDialog; + /** * This class manages and shows the attribute view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/LogView.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/LogView.java index a2a7d2e..1de56ac 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/LogView.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/LogView.java @@ -16,25 +16,6 @@ package oic.simulator.clientcontroller.view; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; - -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.listener.ILogUIListener; -import oic.simulator.clientcontroller.manager.LogManager; -import oic.simulator.clientcontroller.utils.Constants; -import oic.simulator.clientcontroller.view.dialogs.FilterDialog; -import oic.simulator.clientcontroller.view.dialogs.LogDetailsDialog; -import oic.simulator.logger.LogContentProvider; -import oic.simulator.logger.LogEntry; -import oic.simulator.logger.LogLabelProvider; - import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IContributionItem; @@ -73,8 +54,28 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.dialogs.FilteredTree; import org.eclipse.ui.dialogs.PatternFilter; import org.eclipse.ui.part.ViewPart; + +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + import org.oic.simulator.ILogger.Level; +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.listener.ILogUIListener; +import oic.simulator.clientcontroller.manager.LogManager; +import oic.simulator.clientcontroller.utils.Constants; +import oic.simulator.clientcontroller.view.dialogs.FilterDialog; +import oic.simulator.clientcontroller.view.dialogs.LogDetailsDialog; +import oic.simulator.logger.LogContentProvider; +import oic.simulator.logger.LogEntry; +import oic.simulator.logger.LogLabelProvider; + /** * This class manages and shows the log view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/MetaPropertiesView.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/MetaPropertiesView.java index 82516dd..7516f00 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/MetaPropertiesView.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/MetaPropertiesView.java @@ -16,16 +16,6 @@ package oic.simulator.clientcontroller.view; -import java.util.List; - -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.listener.IDevicePlatformInfoUIListener; -import oic.simulator.clientcontroller.listener.IResourceSelectionChangedUIListener; -import oic.simulator.clientcontroller.manager.ResourceManager; -import oic.simulator.clientcontroller.manager.UiListenerHandler; -import oic.simulator.clientcontroller.remoteresource.MetaProperty; -import oic.simulator.clientcontroller.remoteresource.RemoteResource; - import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer; @@ -43,6 +33,16 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Table; import org.eclipse.ui.part.ViewPart; +import java.util.List; + +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.listener.IDevicePlatformInfoUIListener; +import oic.simulator.clientcontroller.listener.IResourceSelectionChangedUIListener; +import oic.simulator.clientcontroller.manager.ResourceManager; +import oic.simulator.clientcontroller.manager.UiListenerHandler; +import oic.simulator.clientcontroller.remoteresource.MetaProperty; +import oic.simulator.clientcontroller.remoteresource.RemoteResource; + /** * This class manages and shows the meta properties view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/ResourceManagerView.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/ResourceManagerView.java index 5af4ec1..1f70ccb 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/ResourceManagerView.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/ResourceManagerView.java @@ -16,19 +16,6 @@ package oic.simulator.clientcontroller.view; -import java.util.List; -import java.util.Set; - -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.listener.IFindResourceUIListener; -import oic.simulator.clientcontroller.manager.ResourceManager; -import oic.simulator.clientcontroller.manager.UiListenerHandler; -import oic.simulator.clientcontroller.remoteresource.RemoteResource; -import oic.simulator.clientcontroller.utils.Constants; -import oic.simulator.clientcontroller.view.dialogs.FindResourceWizard; -import oic.simulator.clientcontroller.view.dialogs.LoadRAMLDialog; -import oic.simulator.clientcontroller.view.dialogs.ResourceWizardDialog; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; @@ -61,8 +48,22 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.FilteredTree; import org.eclipse.ui.dialogs.PatternFilter; import org.eclipse.ui.part.ViewPart; + +import java.util.List; +import java.util.Set; + import org.oic.simulator.SimulatorException; +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.listener.IFindResourceUIListener; +import oic.simulator.clientcontroller.manager.ResourceManager; +import oic.simulator.clientcontroller.manager.UiListenerHandler; +import oic.simulator.clientcontroller.remoteresource.RemoteResource; +import oic.simulator.clientcontroller.utils.Constants; +import oic.simulator.clientcontroller.view.dialogs.FindResourceWizard; +import oic.simulator.clientcontroller.view.dialogs.LoadRAMLDialog; +import oic.simulator.clientcontroller.view.dialogs.ResourceWizardDialog; + /** * This class manages and shows the resource manager view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FilterDialog.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FilterDialog.java index c9626e2..b1f211b 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FilterDialog.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FilterDialog.java @@ -16,12 +16,6 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Map; - -import oic.simulator.clientcontroller.manager.LogManager; - import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -34,6 +28,12 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Shell; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Map; + +import oic.simulator.clientcontroller.manager.LogManager; + /** * This class shows a dialog for filtering logs based on severity levels. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourcePage.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourcePage.java index eeda973..7a46d7e 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourcePage.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourcePage.java @@ -16,11 +16,6 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.util.Set; - -import oic.simulator.clientcontroller.utils.Constants; -import oic.simulator.clientcontroller.utils.Utility; - import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -35,6 +30,11 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import java.util.Set; + +import oic.simulator.clientcontroller.utils.Constants; +import oic.simulator.clientcontroller.utils.Utility; + /** * This class shows UI for finding resources. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourceWizard.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourceWizard.java index 9c70526..13dd429 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourceWizard.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourceWizard.java @@ -16,17 +16,17 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.net.URL; -import java.util.Set; - -import oic.simulator.clientcontroller.Activator; - import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.Wizard; +import java.net.URL; +import java.util.Set; + +import oic.simulator.clientcontroller.Activator; + /** * This class creates a UI wizard for find resource operation. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/GetRequestDialog.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/GetRequestDialog.java index b67717a..ef9cf45 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/GetRequestDialog.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/GetRequestDialog.java @@ -16,11 +16,6 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.util.HashMap; -import java.util.Map; - -import oic.simulator.clientcontroller.utils.Utility; - import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; @@ -37,6 +32,11 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import java.util.HashMap; +import java.util.Map; + +import oic.simulator.clientcontroller.utils.Utility; + /** * This dialog is used for generating a PUT request. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LoadRAMLDialog.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LoadRAMLDialog.java index 8d6e562..5c53bd9 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LoadRAMLDialog.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LoadRAMLDialog.java @@ -16,10 +16,6 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.io.FileInputStream; - -import oic.simulator.clientcontroller.utils.Constants; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; @@ -36,6 +32,10 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import java.io.FileInputStream; + +import oic.simulator.clientcontroller.utils.Constants; + /** * This dialog is used for loading the RAML file. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LogDetailsDialog.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LogDetailsDialog.java index 12d0c59..b8ce102 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LogDetailsDialog.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LogDetailsDialog.java @@ -16,9 +16,6 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.text.DateFormat; -import java.util.Date; - import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; @@ -34,6 +31,9 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import java.text.DateFormat; +import java.util.Date; + /** * This class shows detailed information about a log. The dialog will be opened * on double-clicking a log entry in the log view. diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PostRequestDialog.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PostRequestDialog.java index 6be2b35..53ff50e 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PostRequestDialog.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PostRequestDialog.java @@ -16,17 +16,6 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.util.HashMap; -import java.util.Map; - -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.remoteresource.AttributeElement; -import oic.simulator.clientcontroller.remoteresource.RemoteResource; -import oic.simulator.clientcontroller.remoteresource.ResourceRepresentation; -import oic.simulator.clientcontroller.utils.Constants; -import oic.simulator.clientcontroller.utils.Utility; -import oic.simulator.clientcontroller.view.AttributeEditingSupport; - import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.viewers.ILabelProviderListener; @@ -50,9 +39,21 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; + +import java.util.HashMap; +import java.util.Map; + import org.oic.simulator.AttributeValue.ValueType; import org.oic.simulator.SimulatorResourceAttribute; +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.remoteresource.AttributeElement; +import oic.simulator.clientcontroller.remoteresource.RemoteResource; +import oic.simulator.clientcontroller.remoteresource.ResourceRepresentation; +import oic.simulator.clientcontroller.utils.Constants; +import oic.simulator.clientcontroller.utils.Utility; +import oic.simulator.clientcontroller.view.AttributeEditingSupport; + /** * This dialog is used for generating a POST request. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PutRequestDialog.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PutRequestDialog.java index 435fb44..53eeaac 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PutRequestDialog.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PutRequestDialog.java @@ -16,16 +16,6 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.util.HashMap; -import java.util.Map; - -import oic.simulator.clientcontroller.Activator; -import oic.simulator.clientcontroller.remoteresource.AttributeElement; -import oic.simulator.clientcontroller.remoteresource.RemoteResource; -import oic.simulator.clientcontroller.remoteresource.ResourceRepresentation; -import oic.simulator.clientcontroller.utils.Utility; -import oic.simulator.clientcontroller.view.AttributeEditingSupport; - import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.viewers.ILabelProviderListener; @@ -49,9 +39,20 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; + +import java.util.HashMap; +import java.util.Map; + import org.oic.simulator.AttributeValue.ValueType; import org.oic.simulator.SimulatorResourceAttribute; +import oic.simulator.clientcontroller.Activator; +import oic.simulator.clientcontroller.remoteresource.AttributeElement; +import oic.simulator.clientcontroller.remoteresource.RemoteResource; +import oic.simulator.clientcontroller.remoteresource.ResourceRepresentation; +import oic.simulator.clientcontroller.utils.Utility; +import oic.simulator.clientcontroller.view.AttributeEditingSupport; + /** * This dialog is used for generating a PUT request. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/VerificationDialog.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/VerificationDialog.java index b6ab69f..1170e5b 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/VerificationDialog.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/VerificationDialog.java @@ -16,12 +16,6 @@ package oic.simulator.clientcontroller.view.dialogs; -import java.util.ArrayList; -import java.util.Map; -import java.util.Set; - -import oic.simulator.clientcontroller.utils.Constants; - import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.swt.SWT; @@ -35,6 +29,12 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Shell; +import java.util.ArrayList; +import java.util.Map; +import java.util.Set; + +import oic.simulator.clientcontroller.utils.Constants; + /** * Dialog for starting and stopping the automatic verifications. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogContentProvider.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogContentProvider.java index c782557..fc1429e 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogContentProvider.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogContentProvider.java @@ -16,12 +16,12 @@ package oic.simulator.logger; -import java.util.ArrayList; -import java.util.List; - import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import java.util.ArrayList; +import java.util.List; + /** * Maintains simulator log entries and provides content to the log view. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java index 0404d9c..f7c40c3 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java @@ -16,15 +16,15 @@ package oic.simulator.logger; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; + import java.text.DateFormat; import java.text.SimpleDateFormat; import oic.simulator.clientcontroller.manager.LogManager; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.swt.graphics.Image; - /** * Label provider which determines what data has to be shown in the log view. */ diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LoggerCallback.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LoggerCallback.java index ac2e8ed..2c6393f 100644 --- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LoggerCallback.java +++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LoggerCallback.java @@ -19,11 +19,11 @@ package oic.simulator.logger; import java.util.Calendar; import java.util.Date; +import org.oic.simulator.ILogger; + import oic.simulator.clientcontroller.Activator; import oic.simulator.clientcontroller.utils.Constants; -import org.oic.simulator.ILogger; - /** * Class which provides a callback method to receive log from native layer. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogContentProvider.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogContentProvider.java index c782557..fc1429e 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogContentProvider.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogContentProvider.java @@ -16,12 +16,12 @@ package oic.simulator.logger; -import java.util.ArrayList; -import java.util.List; - import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import java.util.ArrayList; +import java.util.List; + /** * Maintains simulator log entries and provides content to the log view. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java index 832e990..a775ef4 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java @@ -16,15 +16,15 @@ package oic.simulator.logger; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; + import java.text.DateFormat; import java.text.SimpleDateFormat; import oic.simulator.serviceprovider.manager.LogManager; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.swt.graphics.Image; - /** * Label provider which determines what data has to be shown in the log view. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LoggerCallback.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LoggerCallback.java index 83d02fa..a130f19 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LoggerCallback.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LoggerCallback.java @@ -19,11 +19,11 @@ package oic.simulator.logger; import java.util.Calendar; import java.util.Date; +import org.oic.simulator.ILogger; + import oic.simulator.serviceprovider.Activator; import oic.simulator.serviceprovider.utils.Constants; -import org.oic.simulator.ILogger; - /** * Class which provides a callback method to receive log from native layer. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/Activator.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/Activator.java index f9816d3..1293a9b 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/Activator.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/Activator.java @@ -16,13 +16,13 @@ package oic.simulator.serviceprovider; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + import oic.simulator.serviceprovider.manager.ImageManager; import oic.simulator.serviceprovider.manager.LogManager; import oic.simulator.serviceprovider.manager.ResourceManager; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - /** * The activator class controls the plug-in life cycle. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ImageManager.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ImageManager.java index 5ae5c39..c054533 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ImageManager.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ImageManager.java @@ -16,16 +16,16 @@ package oic.simulator.serviceprovider.manager; -import java.net.URL; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; import org.osgi.framework.Bundle; +import java.net.URL; + +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.utils.Constants; + /** * Class which loads the icons/images into the image registry, and has methods * to handle the image related requests from other UI modules. diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/LogManager.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/LogManager.java index b7510a2..5c35db6 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/LogManager.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/LogManager.java @@ -16,23 +16,24 @@ package oic.simulator.serviceprovider.manager; +import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.swt.graphics.Image; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.LinkedList; +import org.oic.simulator.ILogger; +import org.oic.simulator.ILogger.Level; +import org.oic.simulator.SimulatorManager; + import oic.simulator.logger.LogEntry; import oic.simulator.logger.LoggerCallback; import oic.simulator.serviceprovider.Activator; import oic.simulator.serviceprovider.listener.ILogListener; import oic.simulator.serviceprovider.utils.Constants; -import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.swt.graphics.Image; -import org.oic.simulator.ILogger; -import org.oic.simulator.ILogger.Level; -import org.oic.simulator.SimulatorManager; - /** * Class which handles the native logs, maintains log entries and updates the * UI. diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ResourceManager.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ResourceManager.java index 3d22bd7..a1bed35 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ResourceManager.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ResourceManager.java @@ -16,6 +16,9 @@ package oic.simulator.serviceprovider.manager; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.swt.widgets.Display; + import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -27,17 +30,6 @@ import java.util.Map; import java.util.Set; import java.util.Vector; -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.model.AttributeElement; -import oic.simulator.serviceprovider.model.MetaProperty; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.ResourceType; -import oic.simulator.serviceprovider.model.SingleResource; -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.utils.Utility; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.swt.widgets.Display; import org.oic.simulator.ArrayProperty; import org.oic.simulator.AttributeProperty; import org.oic.simulator.AttributeProperty.Type; @@ -64,6 +56,15 @@ import org.oic.simulator.server.SimulatorResource.ObserverListener; import org.oic.simulator.server.SimulatorResource.ResourceModelChangeListener; import org.oic.simulator.server.SimulatorSingleResource; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.model.AttributeElement; +import oic.simulator.serviceprovider.model.MetaProperty; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.ResourceType; +import oic.simulator.serviceprovider.model.SingleResource; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.utils.Utility; + /** * This class acts as an interface between the simulator java SDK and the * various UI modules. It maintains all the details of resources and provides diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeElement.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeElement.java index 5e05bb7..e1a70cd 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeElement.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeElement.java @@ -19,10 +19,6 @@ package oic.simulator.serviceprovider.model; import java.util.HashMap; import java.util.Map; -import oic.simulator.serviceprovider.manager.UiListenerHandler; -import oic.simulator.serviceprovider.utils.AttributeValueStringConverter; -import oic.simulator.serviceprovider.utils.Constants; - import org.oic.simulator.ArrayProperty; import org.oic.simulator.AttributeProperty; import org.oic.simulator.AttributeValue; @@ -35,6 +31,10 @@ import org.oic.simulator.SimulatorResourceModel; import org.oic.simulator.StringProperty; import org.oic.simulator.server.SimulatorResource.AutoUpdateType; +import oic.simulator.serviceprovider.manager.UiListenerHandler; +import oic.simulator.serviceprovider.utils.AttributeValueStringConverter; +import oic.simulator.serviceprovider.utils.Constants; + public class AttributeElement { private Object mParent = null; private SimulatorResourceAttribute mAttribute = null; diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeHelper.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeHelper.java index 5b53964..4e93582 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeHelper.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeHelper.java @@ -19,10 +19,6 @@ package oic.simulator.serviceprovider.model; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import java.util.Vector; - -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.utils.Utility; import org.oic.simulator.AttributeProperty; import org.oic.simulator.AttributeValue; @@ -33,6 +29,9 @@ import org.oic.simulator.IntegerProperty; import org.oic.simulator.SimulatorResourceAttribute; import org.oic.simulator.StringProperty; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.utils.Utility; + public class AttributeHelper { private String attributeName; private String attributeType; diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/ResourceRepresentation.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/ResourceRepresentation.java index 275a7e6..1c75cf6 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/ResourceRepresentation.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/ResourceRepresentation.java @@ -19,12 +19,12 @@ package oic.simulator.serviceprovider.model; import java.util.HashMap; import java.util.Map; -import oic.simulator.serviceprovider.manager.UiListenerHandler; - import org.oic.simulator.AttributeValue; import org.oic.simulator.SimulatorResourceAttribute; import org.oic.simulator.SimulatorResourceModel; +import oic.simulator.serviceprovider.manager.UiListenerHandler; + public class ResourceRepresentation { private Map mAttributes = new HashMap(); diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/perspective/PerspectiveFactory.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/perspective/PerspectiveFactory.java index e24a456..323db9f 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/perspective/PerspectiveFactory.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/perspective/PerspectiveFactory.java @@ -16,17 +16,17 @@ package oic.simulator.serviceprovider.perspective; +import org.eclipse.ui.IFolderLayout; +import org.eclipse.ui.IPageLayout; +import org.eclipse.ui.IPerspectiveFactory; + import oic.simulator.serviceprovider.view.AttributeView; +import oic.simulator.serviceprovider.view.DevicePlatformInfoView; import oic.simulator.serviceprovider.view.LogView; import oic.simulator.serviceprovider.view.MetaPropertiesView; -import oic.simulator.serviceprovider.view.DevicePlatformInfoView; import oic.simulator.serviceprovider.view.ResourceManagerView; import oic.simulator.serviceprovider.view.ResourceObserverView; -import org.eclipse.ui.IFolderLayout; -import org.eclipse.ui.IPageLayout; -import org.eclipse.ui.IPerspectiveFactory; - /** * This class creates a new eclipse perspective for service provider and * positions the different views inside. diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/utils/Utility.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/utils/Utility.java index b7e7761..03ddf8a 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/utils/Utility.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/utils/Utility.java @@ -28,16 +28,16 @@ import java.util.Map; import java.util.Set; import java.util.Vector; -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.SingleResource; - import org.oic.simulator.AttributeValue; import org.oic.simulator.AttributeValue.TypeInfo; import org.oic.simulator.AttributeValue.ValueType; import org.oic.simulator.ILogger.Level; import org.oic.simulator.SimulatorException; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.SingleResource; + /** * This class has common utility methods. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeEditingSupport.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeEditingSupport.java index 7137a11..af898e6 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeEditingSupport.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeEditingSupport.java @@ -16,20 +16,6 @@ package oic.simulator.serviceprovider.view; -import java.util.Date; -import java.util.List; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.manager.ResourceManager; -import oic.simulator.serviceprovider.model.AttributeElement; -import oic.simulator.serviceprovider.model.AutomationSettingHelper; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.ResourceRepresentation; -import oic.simulator.serviceprovider.model.SingleResource; -import oic.simulator.serviceprovider.utils.AttributeValueBuilder; -import oic.simulator.serviceprovider.utils.Utility; -import oic.simulator.serviceprovider.view.dialogs.AutomationSettingDialog; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CheckboxCellEditor; @@ -48,6 +34,10 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.IPartListener2; import org.eclipse.ui.IWorkbenchPartReference; + +import java.util.Date; +import java.util.List; + import org.oic.simulator.AttributeProperty; import org.oic.simulator.AttributeValue; import org.oic.simulator.AttributeValue.TypeInfo; @@ -57,6 +47,17 @@ import org.oic.simulator.InvalidArgsException; import org.oic.simulator.SimulatorResourceAttribute; import org.oic.simulator.server.SimulatorResource.AutoUpdateType; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.manager.ResourceManager; +import oic.simulator.serviceprovider.model.AttributeElement; +import oic.simulator.serviceprovider.model.AutomationSettingHelper; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.ResourceRepresentation; +import oic.simulator.serviceprovider.model.SingleResource; +import oic.simulator.serviceprovider.utils.AttributeValueBuilder; +import oic.simulator.serviceprovider.utils.Utility; +import oic.simulator.serviceprovider.view.dialogs.AutomationSettingDialog; + /** * This class provides editing support to the resources attributes table in the * attributes view. diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeView.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeView.java index a4bb01e..56eac4b 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeView.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeView.java @@ -16,19 +16,6 @@ package oic.simulator.serviceprovider.view; -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.listener.IAutomationListener; -import oic.simulator.serviceprovider.listener.IDataChangeListener; -import oic.simulator.serviceprovider.listener.ISelectionChangedListener; -import oic.simulator.serviceprovider.manager.ResourceManager; -import oic.simulator.serviceprovider.manager.UiListenerHandler; -import oic.simulator.serviceprovider.model.AttributeElement; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.ResourceRepresentation; -import oic.simulator.serviceprovider.model.SingleResource; -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.utils.Utility; - import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; @@ -48,11 +35,25 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.ui.part.ViewPart; + import org.oic.simulator.AttributeValue; import org.oic.simulator.AttributeValue.TypeInfo; import org.oic.simulator.AttributeValue.ValueType; import org.oic.simulator.SimulatorResourceAttribute; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.listener.IAutomationListener; +import oic.simulator.serviceprovider.listener.IDataChangeListener; +import oic.simulator.serviceprovider.listener.ISelectionChangedListener; +import oic.simulator.serviceprovider.manager.ResourceManager; +import oic.simulator.serviceprovider.manager.UiListenerHandler; +import oic.simulator.serviceprovider.model.AttributeElement; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.ResourceRepresentation; +import oic.simulator.serviceprovider.model.SingleResource; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.utils.Utility; + /** * This class manages and shows the attribute view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/DevicePlatformInfoView.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/DevicePlatformInfoView.java index e3cb422..bc42c37 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/DevicePlatformInfoView.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/DevicePlatformInfoView.java @@ -16,14 +16,6 @@ package oic.simulator.serviceprovider.view; -import java.util.List; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.listener.IDeviceInfoListener; -import oic.simulator.serviceprovider.manager.UiListenerHandler; -import oic.simulator.serviceprovider.model.MetaProperty; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnLabelProvider; @@ -50,6 +42,14 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Table; import org.eclipse.ui.part.ViewPart; +import java.util.List; + +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.listener.IDeviceInfoListener; +import oic.simulator.serviceprovider.manager.UiListenerHandler; +import oic.simulator.serviceprovider.model.MetaProperty; +import oic.simulator.serviceprovider.utils.Constants; + /** * This class is used to set the platform and device information. The * information is only one per stack and hence only one instance can be diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/LogView.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/LogView.java index 49fb11c..a43d546 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/LogView.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/LogView.java @@ -16,24 +16,6 @@ package oic.simulator.serviceprovider.view; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.List; - -import oic.simulator.logger.LogContentProvider; -import oic.simulator.logger.LogEntry; -import oic.simulator.logger.LogLabelProvider; -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.listener.ILogListener; -import oic.simulator.serviceprovider.manager.LogManager; -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.view.dialogs.FilterDialog; -import oic.simulator.serviceprovider.view.dialogs.LogDetailsDialog; - import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IContributionItem; @@ -72,8 +54,27 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.dialogs.FilteredTree; import org.eclipse.ui.dialogs.PatternFilter; import org.eclipse.ui.part.ViewPart; + +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.List; + import org.oic.simulator.ILogger.Level; +import oic.simulator.logger.LogContentProvider; +import oic.simulator.logger.LogEntry; +import oic.simulator.logger.LogLabelProvider; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.listener.ILogListener; +import oic.simulator.serviceprovider.manager.LogManager; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.view.dialogs.FilterDialog; +import oic.simulator.serviceprovider.view.dialogs.LogDetailsDialog; + /** * This class manages and shows the log view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java index 4ba8c83..936df8f 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java @@ -16,23 +16,6 @@ package oic.simulator.serviceprovider.view; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.listener.ISelectionChangedListener; -import oic.simulator.serviceprovider.manager.ResourceManager; -import oic.simulator.serviceprovider.manager.UiListenerHandler; -import oic.simulator.serviceprovider.model.MetaProperty; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.SingleResource; -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.utils.Utility; -import oic.simulator.serviceprovider.view.dialogs.UpdateResourceInterfaceDialog; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.EditingSupport; @@ -57,8 +40,26 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.part.ViewPart; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.oic.simulator.SimulatorException; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.listener.ISelectionChangedListener; +import oic.simulator.serviceprovider.manager.ResourceManager; +import oic.simulator.serviceprovider.manager.UiListenerHandler; +import oic.simulator.serviceprovider.model.MetaProperty; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.SingleResource; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.utils.Utility; +import oic.simulator.serviceprovider.view.dialogs.UpdateResourceInterfaceDialog; + /** * This class manages and shows the meta properties view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceManagerView.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceManagerView.java index a14b178..b8ed4b0 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceManagerView.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceManagerView.java @@ -16,26 +16,6 @@ package oic.simulator.serviceprovider.view; -import java.util.ArrayList; -import java.util.List; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.listener.IPropertiesChangedListener; -import oic.simulator.serviceprovider.listener.IResourceListChangedListener; -import oic.simulator.serviceprovider.manager.ResourceManager; -import oic.simulator.serviceprovider.manager.UiListenerHandler; -import oic.simulator.serviceprovider.model.AutomationSettingHelper; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.ResourceType; -import oic.simulator.serviceprovider.model.SingleResource; -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.utils.Utility; -import oic.simulator.serviceprovider.view.dialogs.AutomationSettingDialog; -import oic.simulator.serviceprovider.view.dialogs.CreateResourceWizard; -import oic.simulator.serviceprovider.view.dialogs.DeleteResourceWizard; -import oic.simulator.serviceprovider.view.dialogs.MainPage.Option; -import oic.simulator.serviceprovider.view.dialogs.ResourceWizardDialog; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; @@ -67,9 +47,30 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.FilteredTree; import org.eclipse.ui.dialogs.PatternFilter; import org.eclipse.ui.part.ViewPart; + +import java.util.ArrayList; +import java.util.List; + import org.oic.simulator.SimulatorException; import org.oic.simulator.server.SimulatorResource.AutoUpdateType; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.listener.IPropertiesChangedListener; +import oic.simulator.serviceprovider.listener.IResourceListChangedListener; +import oic.simulator.serviceprovider.manager.ResourceManager; +import oic.simulator.serviceprovider.manager.UiListenerHandler; +import oic.simulator.serviceprovider.model.AutomationSettingHelper; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.ResourceType; +import oic.simulator.serviceprovider.model.SingleResource; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.utils.Utility; +import oic.simulator.serviceprovider.view.dialogs.AutomationSettingDialog; +import oic.simulator.serviceprovider.view.dialogs.CreateResourceWizard; +import oic.simulator.serviceprovider.view.dialogs.DeleteResourceWizard; +import oic.simulator.serviceprovider.view.dialogs.MainPage.Option; +import oic.simulator.serviceprovider.view.dialogs.ResourceWizardDialog; + /** * This class manages and shows the resource manager view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceObserverView.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceObserverView.java index b13e247..10d468f 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceObserverView.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceObserverView.java @@ -16,19 +16,6 @@ package oic.simulator.serviceprovider.view; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.listener.IObserverListChangedListener; -import oic.simulator.serviceprovider.listener.ISelectionChangedListener; -import oic.simulator.serviceprovider.manager.ResourceManager; -import oic.simulator.serviceprovider.manager.UiListenerHandler; -import oic.simulator.serviceprovider.model.ObserverDetail; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CheckboxCellEditor; import org.eclipse.jface.viewers.ColumnLabelProvider; @@ -48,6 +35,19 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Table; import org.eclipse.ui.part.ViewPart; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.listener.IObserverListChangedListener; +import oic.simulator.serviceprovider.listener.ISelectionChangedListener; +import oic.simulator.serviceprovider.manager.ResourceManager; +import oic.simulator.serviceprovider.manager.UiListenerHandler; +import oic.simulator.serviceprovider.model.ObserverDetail; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.utils.Constants; + /** * This class manages and shows the resource observer view in the perspective. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddAttributeDialog.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddAttributeDialog.java index 186ea6c..17ad973 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddAttributeDialog.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddAttributeDialog.java @@ -16,13 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.util.Iterator; -import java.util.Set; - -import oic.simulator.serviceprovider.model.AttributeHelper; -import oic.simulator.serviceprovider.model.AttributeHelper.ValidValuesType; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.window.Window; @@ -45,7 +38,13 @@ import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.oic.simulator.AttributeProperty.Type; + +import java.util.Iterator; +import java.util.Set; + +import oic.simulator.serviceprovider.model.AttributeHelper; +import oic.simulator.serviceprovider.model.AttributeHelper.ValidValuesType; +import oic.simulator.serviceprovider.utils.Constants; public class AddAttributeDialog extends TitleAreaDialog { diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddInterfaceTypeDialog.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddInterfaceTypeDialog.java index 912f7d7..6246d12 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddInterfaceTypeDialog.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddInterfaceTypeDialog.java @@ -16,8 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.util.List; - import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -30,6 +28,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import java.util.List; + /** * This class shows a dialog for filtering logs based on severity levels. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AutomationSettingDialog.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AutomationSettingDialog.java index f6ab64b..80ab2a3 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AutomationSettingDialog.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AutomationSettingDialog.java @@ -16,12 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.util.Iterator; -import java.util.List; - -import oic.simulator.serviceprovider.model.AutomationSettingHelper; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; @@ -34,6 +28,12 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import java.util.Iterator; +import java.util.List; + +import oic.simulator.serviceprovider.model.AutomationSettingHelper; +import oic.simulator.serviceprovider.utils.Constants; + /** * This class manages and shows the automation settings dialog from the * attribute view. diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/CreateResourceWizard.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/CreateResourceWizard.java index 07c560f..399cf6e 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/CreateResourceWizard.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/CreateResourceWizard.java @@ -16,6 +16,18 @@ package oic.simulator.serviceprovider.view.dialogs; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Display; + import java.io.FileInputStream; import java.lang.reflect.InvocationTargetException; import java.net.URL; @@ -25,6 +37,10 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.oic.simulator.ILogger.Level; +import org.oic.simulator.SimulatorException; +import org.oic.simulator.SimulatorResourceAttribute; + import oic.simulator.serviceprovider.Activator; import oic.simulator.serviceprovider.manager.UiListenerHandler; import oic.simulator.serviceprovider.model.AttributeHelper; @@ -35,21 +51,6 @@ import oic.simulator.serviceprovider.utils.Constants; import oic.simulator.serviceprovider.utils.Utility; import oic.simulator.serviceprovider.view.dialogs.MainPage.Option; -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.oic.simulator.ILogger.Level; -import org.oic.simulator.SimulatorException; -import org.oic.simulator.SimulatorResourceAttribute; - /** * This class creates a UI wizard for create resource operation. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourcePage.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourcePage.java index a362ada..b344aeb 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourcePage.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourcePage.java @@ -16,15 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.SingleResource; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; @@ -43,6 +34,15 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.SingleResource; +import oic.simulator.serviceprovider.utils.Constants; + /** * This class shows UI for deleting resources. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourceWizard.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourceWizard.java index fdeb9cb..c81078a 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourceWizard.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourceWizard.java @@ -16,16 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.lang.reflect.InvocationTargetException; -import java.net.URL; -import java.util.Date; -import java.util.Set; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.manager.ResourceManager; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.SingleResource; - import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; @@ -33,9 +23,20 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.Wizard; + +import java.lang.reflect.InvocationTargetException; +import java.net.URL; +import java.util.Date; +import java.util.Set; + import org.oic.simulator.ILogger.Level; import org.oic.simulator.SimulatorException; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.manager.ResourceManager; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.SingleResource; + /** * This class creates a UI wizard for delete resource operation. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/FilterDialog.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/FilterDialog.java index b43d4cc..48be0a3 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/FilterDialog.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/FilterDialog.java @@ -16,12 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Map; - -import oic.simulator.serviceprovider.manager.LogManager; - import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -34,6 +28,12 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Shell; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Map; + +import oic.simulator.serviceprovider.manager.LogManager; + /** * This class shows a dialog for filtering logs based on severity levels. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LoadRamlPage.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LoadRamlPage.java index da3694d..a09bc36 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LoadRamlPage.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LoadRamlPage.java @@ -16,17 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.io.FileInputStream; -import java.lang.reflect.InvocationTargetException; -import java.util.Date; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.model.Resource; -import oic.simulator.serviceprovider.model.SingleResource; -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.utils.Utility; -import oic.simulator.serviceprovider.view.dialogs.MainPage.Option; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -51,11 +40,23 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; + +import java.io.FileInputStream; +import java.lang.reflect.InvocationTargetException; +import java.util.Date; + import org.oic.simulator.ILogger.Level; import org.oic.simulator.SimulatorException; import org.oic.simulator.server.SimulatorResource; import org.oic.simulator.server.SimulatorResource.Type; +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.model.Resource; +import oic.simulator.serviceprovider.model.SingleResource; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.utils.Utility; +import oic.simulator.serviceprovider.view.dialogs.MainPage.Option; + /** * This class shows UI for creating resources. */ diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LogDetailsDialog.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LogDetailsDialog.java index 81c1f6a..f0fda99 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LogDetailsDialog.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LogDetailsDialog.java @@ -16,9 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.text.DateFormat; -import java.util.Date; - import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; @@ -34,6 +31,9 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import java.text.DateFormat; +import java.util.Date; + /** * This class shows detailed information about a log. The dialog will be opened * on double-clicking a log entry in the log view. diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/MainPage.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/MainPage.java index 0a6f022..2ea42cf 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/MainPage.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/MainPage.java @@ -16,8 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -29,8 +27,11 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; + import org.oic.simulator.server.SimulatorResource.Type; +import oic.simulator.serviceprovider.utils.Constants; + public class MainPage extends WizardPage { private Button simpleBtn; diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceAddAttributePage.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceAddAttributePage.java index da3ccc3..17eae39 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceAddAttributePage.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceAddAttributePage.java @@ -16,17 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import oic.simulator.serviceprovider.model.AttributeHelper; -import oic.simulator.serviceprovider.model.AttributeHelper.ValidValuesType; -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.utils.Utility; - import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; @@ -48,7 +37,17 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; -import org.oic.simulator.AttributeProperty.Type; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import oic.simulator.serviceprovider.model.AttributeHelper; +import oic.simulator.serviceprovider.model.AttributeHelper.ValidValuesType; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.utils.Utility; public class SimpleResourceAddAttributePage extends WizardPage { diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceBasicDetailsPage.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceBasicDetailsPage.java index 0932566..db4a61e 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceBasicDetailsPage.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceBasicDetailsPage.java @@ -16,17 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import oic.simulator.serviceprovider.Activator; -import oic.simulator.serviceprovider.model.SingleResource; -import oic.simulator.serviceprovider.utils.Constants; -import oic.simulator.serviceprovider.utils.Utility; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.IWizardPage; @@ -46,6 +35,17 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Text; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import oic.simulator.serviceprovider.Activator; +import oic.simulator.serviceprovider.model.SingleResource; +import oic.simulator.serviceprovider.utils.Constants; +import oic.simulator.serviceprovider.utils.Utility; + public class SimpleResourceBasicDetailsPage extends WizardPage { private Text resNameTxt; diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceOtherDetailsPage.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceOtherDetailsPage.java index 4dc9f21..97c7216 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceOtherDetailsPage.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceOtherDetailsPage.java @@ -16,8 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -31,6 +29,8 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import oic.simulator.serviceprovider.utils.Constants; + public class SimpleResourceOtherDetailsPage extends WizardPage { private Button getBtn; diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdatePropertiesPage.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdatePropertiesPage.java index 6f93ff1..b7628a6 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdatePropertiesPage.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdatePropertiesPage.java @@ -16,8 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -30,6 +28,8 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import oic.simulator.serviceprovider.utils.Constants; + public class UpdatePropertiesPage extends WizardPage { private Text resNameTxt; diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdateResourceInterfaceDialog.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdateResourceInterfaceDialog.java index 33557d5..926c93f 100644 --- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdateResourceInterfaceDialog.java +++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdateResourceInterfaceDialog.java @@ -16,11 +16,6 @@ package oic.simulator.serviceprovider.view.dialogs; -import java.util.ArrayList; -import java.util.Map; - -import oic.simulator.serviceprovider.utils.Constants; - import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.TrayDialog; @@ -38,6 +33,11 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Shell; +import java.util.ArrayList; +import java.util.Map; + +import oic.simulator.serviceprovider.utils.Constants; + /** * Dialog for starting and stopping the automatic verifications. */