porting code to work with ice 3.7

ATNF · Oct 8, 2020 · 8646d10 · 8646d10
1 parent be2cedc
commit 8646d10
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/build.xml b/build.xml
@@ -8,7 +8,7 @@
   <property name="javadoc" value="javadoc"/>
   <property name="jarname" value="open-monica.jar"/>
   <property name="prefix" value="/usr/local/"/>
-  <property name="ice-version" value="3.6.3"/>
+  <property name="ice-version" value="3.7.2"/>
 
 
   <!-- Purge build and doc directories (but not jar file) -->
@@ -28,7 +28,7 @@
     </copy>
 
     <mkdir dir="${output}"/>
-    <javac destdir="${output}" debug="true" includeantruntime="false" target="1.6" source="1.6">            
+    <javac destdir="${output}" debug="true" includeantruntime="false">
       <compilerarg value="-Xlint:unchecked"/>
       <src path="${src}"/>            
       <classpath refid="3rdParty"/>

diff --git a/src/atnf/atoms/mon/comms/MoniCAIceI.java b/src/atnf/atoms/mon/comms/MoniCAIceI.java
@@ -33,8 +33,6 @@
  * @author David Brodrick
  */
 public final class MoniCAIceI implements MoniCAIce {
-  private String _name;
-
   /** The currently running server. */
   protected static MoniCAIceServerThread theirServer = null;
 
@@ -53,14 +51,7 @@ public final class MoniCAIceI implements MoniCAIce {
     }
   }
 
-  public MoniCAIceI(String name) {
-    _name = name;
-  }
-
-  @Override
-  public String name(Current current)
-  {
-    return _name;
+  public MoniCAIceI() {
   }
 
   /** Add the new points to the system. */

diff --git a/src/atnf/atoms/mon/externalsystem/IceStormSubscriber.java b/src/atnf/atoms/mon/externalsystem/IceStormSubscriber.java
@@ -18,7 +18,6 @@
 import atnf.atoms.time.AbsTime;
 
 import com.zeroc.Ice.Communicator;
-import com.zeroc.Ice.ObjectImpl;
 import com.zeroc.Ice.InitializationData;
 import com.zeroc.Ice.ObjectPrx;
 import com.zeroc.Ice.ObjectAdapter;
@@ -71,7 +70,7 @@ public class IceStormSubscriber extends ExternalSystem
   protected Communicator itsCommunicator;
 
   /** The actual interface implementation. */
-  protected ObjectImpl itsSubscriber;
+  protected com.zeroc.Ice.Object itsSubscriber;
 
   /** Constructor. */
   public IceStormSubscriber(String[] args)