Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadCommandSystem
Commits
039cc878
Commit
039cc878
authored
May 22, 2014
by
yannick legoc
Browse files
removed Controller.idl, Driver.idl and Servant.idl
parent
d3f7691a
Changes
6
Hide whitespace changes
Inline
Side-by-side
new_start/build.xml
View file @
039cc878
...
...
@@ -60,21 +60,6 @@
<arg
line=
"${idlFlags} ${idlCoreDir}/ServantManager.idl"
/>
</exec>
<echo
message=
"Generating Servant.java"
/>
<exec
executable=
"idl"
>
<arg
line=
"${idlFlags} ${idlCoreDir}/Servant.idl"
/>
</exec>
<echo
message=
"Generating Controller.java"
/>
<exec
executable=
"idl"
>
<arg
line=
"${idlFlags} ${idlCoreDir}/Controller.idl"
/>
</exec>
<echo
message=
"Generating Driver.java"
/>
<exec
executable=
"idl"
>
<arg
line=
"${idlFlags} ${idlCoreDir}/Driver.idl"
/>
</exec>
<echo
message=
"Generating DatabaseAccessor.java"
/>
<exec
executable=
"idl"
>
<arg
line=
"${idlFlags} ${idlCoreDir}/DatabaseAccessor.idl"
/>
...
...
new_start/src/fr/ill/ics/nscclient/servant/CorbaController.java
View file @
039cc878
...
...
@@ -18,7 +18,6 @@
package
fr.ill.ics.nscclient.servant
;
import
fr.ill.ics.nomadserver.core.Controller
;
public
class
CorbaController
extends
CorbaServant
{
...
...
new_start/src/fr/ill/ics/nscclient/servant/CorbaDriver.java
View file @
039cc878
...
...
@@ -18,7 +18,6 @@
package
fr.ill.ics.nscclient.servant
;
import
fr.ill.ics.nomadserver.core.Driver
;
public
class
CorbaDriver
extends
CorbaServant
{
...
...
new_start/src/fr/ill/ics/nscclient/servant/CorbaServant.java
View file @
039cc878
...
...
@@ -18,8 +18,6 @@
package
fr.ill.ics.nscclient.servant
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
...
...
@@ -30,16 +28,6 @@ import fr.ill.ics.bridge.listeners.ServerProgressChangeListener;
import
fr.ill.ics.bridge.listeners.ServerPropertyChangeListener
;
import
fr.ill.ics.bridge.listeners.ServerResetCommandListener
;
import
fr.ill.ics.core.command.CommandAction
;
import
fr.ill.ics.nomadserver.common.ListItem
;
import
fr.ill.ics.nomadserver.common.ListIterator
;
import
fr.ill.ics.nomadserver.core.Servant
;
import
fr.ill.ics.nomadserver.core.ServantPackage.IteratorFailureException
;
import
fr.ill.ics.nomadserver.dataprovider.ChildServantDescriptor
;
import
fr.ill.ics.nomadserver.dataprovider.ChildServantDescriptorHelper
;
import
fr.ill.ics.nomadserver.dataprovider.CommandDescriptor
;
import
fr.ill.ics.nomadserver.dataprovider.CommandDescriptorHelper
;
import
fr.ill.ics.nomadserver.dataprovider.PropertyDescriptor
;
import
fr.ill.ics.nomadserver.dataprovider.PropertyDescriptorHelper
;
import
fr.ill.ics.nscclient.dataprovider.CommandDatabase
;
import
fr.ill.ics.nscclient.dataprovider.DataAccessor
;
import
fr.ill.ics.nscclient.dataprovider.DataAccessor.ClientCommandState
;
...
...
new_start/src/fr/ill/ics/nscclient/servant/CorbaServantManager.java
View file @
039cc878
...
...
@@ -20,7 +20,6 @@ package fr.ill.ics.nscclient.servant;
import
java.io.ByteArrayInputStream
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Iterator
;
...
...
@@ -31,21 +30,14 @@ import java.util.Map;
import
java.util.StringTokenizer
;
import
fr.ill.ics.core.property.PropertyManager
;
import
fr.ill.ics.nomadserver.common.ListItem
;
import
fr.ill.ics.nomadserver.common.ListIterator
;
import
fr.ill.ics.nomadserver.configuration.ServantDataConfiguration
;
import
fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantData
;
import
fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantDataUpdate
;
import
fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantDynamicProperties
;
import
fr.ill.ics.nomadserver.core.Driver
;
import
fr.ill.ics.nomadserver.core.ServantManager
;
import
fr.ill.ics.nomadserver.core.DriverPackage.DriverMode
;
import
fr.ill.ics.nomadserver.core.ServantManagerPackage.IteratorFailureException
;
import
fr.ill.ics.nomadserver.core.ServantManagerPackage.NoSuchServantException
;
import
fr.ill.ics.nomadserver.core.ServantManagerPackage.ServantCreationException
;
import
fr.ill.ics.nomadserver.core.ServantManagerPackage.ServantRemovalException
;
import
fr.ill.ics.nomadserver.dataprovider.ServantDescriptor
;
import
fr.ill.ics.nomadserver.dataprovider.ServantDescriptorHelper
;
import
fr.ill.ics.nscclient.dataprovider.CommandDatabase
;
import
fr.ill.ics.nscclient.dataprovider.PropertyDatabase
;
import
fr.ill.ics.nscclient.dataprovider.ServantDatabase
;
...
...
new_start/src/fr/ill/ics/nscclient/servant/scan/CorbaIcsParameterizableScan1D.java
View file @
039cc878
...
...
@@ -24,7 +24,6 @@ import java.util.Map;
import
fr.ill.ics.bridge.scan.IParameterizableScan1D
;
import
fr.ill.ics.core.property.Property
;
import
fr.ill.ics.nomadserver.core.Controller
;
import
fr.ill.ics.nscclient.servant.ClientServantDescriptor
;
import
fr.ill.ics.nscclient.servant.CorbaController
;
import
fr.ill.ics.util.ConfigManager
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment