Changeset 2622 for trunk

Timestamp:

07/14/08 15:29:34 (8 weeks ago)

Author:

ola

Message:

update for r2621

Location:

trunk/components

Files:

• blitz/resources/omero/API.ice (modified) (2 diffs)
• common/src/ome/api/IShare.java (modified) (3 diffs)

trunk/components/blitz/resources/omero/API.ice

@@ -284 +284 @@
       };
 
-    dictionary<omero::model::Experimenter, string> ConnMap;
-    
     interface IShare extends ServiceInterface
       {
         void activate(long shareId);
-        omero::model::Session getShare(long sessionId) throws ServerError;
-        SessionList getAllShares(bool active) throws ServerError;
-        SessionList getOwnShares(bool active) throws ServerError;
-        SessionList getMemberShares(bool active) throws ServerError;
-        SessionList getSharesOwnedBy(omero::model::Experimenter user, bool active) throws ServerError;
-        SessionList getMemberSharesFor(omero::model::Experimenter user, bool active) throws ServerError;
-
-        IObjectList getContents(long shareId) throws ServerError;
-        IObjectList getContentSubList(long shareId, int start, int finish) throws ServerError;
-        int getContentSize(long shareId) throws ServerError;
-        IdListMap getContentMap(long shareId) throws ServerError;
+        omero::model::Session getShare(long sessionId);
+        SessionList getAllShares(bool active);
+        SessionList getOwnShares(bool active);
+        SessionList getMemberShares(bool active);
+        SessionList getSharesOwnedBy(omero::model::Experimenter user, bool active);
+        SessionList getMemberSharesFor(omero::model::Experimenter user, bool active);
+        IObjectList getContents(long shareId);
+        IObjectList getContentSubList(long shareId, int start, int finish);
+        int getContentSize(long shareId);
+        IdListMap getContentMap(long shareId);
 
         long createShare(string description, 
@@ -336 +333 @@
         void removeGuest(long shareId, string emailAddress);
 
-        ConnMap getActiveConnections(long shareId) throws ServerError;
-        ConnMap getPastConnections(long shareId) throws ServerError;
-        void invalidateConnection(long shareId, omero::model::Experimenter exp) throws ServerError;
-        omero::model::Event getEvents(long shareId, omero::model::Experimenter exp, omero::RTime from, omero::RTime to) throws ServerError;
-
+        //dictionary<string, omero::model::Experimenter> getActiveConnections(long shareId);
+        //dictionary<string, omero::model::Experimenter> getPastConnections(long shareId);
+        void invalidateConnection(long shareId, omero::model::Experimenter exp);
+        IObjectList getEvents(long shareId, omero::model::Experimenter exp, omero::RTime from, omero::RTime to);
       };
 

trunk/components/common/src/ome/api/IShare.java

@@ -386 +386 @@
      * @return map of experimenter and IP address
      */
-    Map<Experimenter, String> getActiveConnections(@NotNull
+    Map<String, Experimenter> getActiveConnections(@NotNull
     long shareId);
 
@@ -395 +395 @@
      * @return map of experimenter and IP address
      */
-    Map<Experimenter, String> getPastConnections(@NotNull
+    Map<String, Experimenter> getPastConnections(@NotNull
     long shareId);
 
@@ -419 +419 @@
      * @param to -
      *            time
-     * @return map of dates and type of actions
-     */
-    Event getEvents(@NotNull
+     * @return List of events
+     */
+    List<Event> getEvents(@NotNull
     long shareId, Experimenter experimenter, Timestamp from, Timestamp to);