[Cogkit-svn] SF.net SVN: cogkit:[2197] trunk/current/src/cog/modules/abstraction-common/ src/org/globus/cog/abstraction/impl/file

[<ha...@us...>]

Revision: 2197
          http://cogkit.svn.sourceforge.net/cogkit/?rev=2197&view=rev
Author:   hategan
Date:     2008-09-30 16:40:55 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
updated implementations

Modified Paths:
--------------
    trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/GridFileImpl.java
    trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/PermissionsImpl.java
    trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/UnixPermissionsImpl.java

Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/GridFileImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/GridFileImpl.java	2008-09-30 16:39:31 UTC (rev 2196)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/GridFileImpl.java	2008-09-30 16:40:55 UTC (rev 2197)
@@ -24,12 +24,12 @@
 
     private Permissions userPermissions = null;
     private Permissions groupPermissions = null;
-    private Permissions allPermissions = null;
+    private Permissions worldPermissions = null;
 
     public GridFileImpl() {
         userPermissions = new PermissionsImpl();
         groupPermissions = new PermissionsImpl();
-        allPermissions = new PermissionsImpl();
+        worldPermissions = new PermissionsImpl();
     }
 
     /** set name for the file */
@@ -133,15 +133,23 @@
     }
 
     /** set permissions for all users */
-    public void setAllPermissions(Permissions allPermissions) {
-        this.allPermissions = allPermissions;
+    public void setWorldPermissions(Permissions worldPermissions) {
+        this.worldPermissions = worldPermissions;
     }
 
     /** return permissions for all users */
+    public Permissions getWorldPermissions() {
+        return worldPermissions;
+    }
+    
     public Permissions getAllPermissions() {
-        return allPermissions;
+        return getWorldPermissions();
     }
 
+    public void setAllPermissions(Permissions worldPermissions) {
+        setWorldPermissions(worldPermissions);
+    }
+
     /** return true if the user can read from this file */
     public boolean userCanRead() {
         return userPermissions.getRead();
@@ -174,17 +182,17 @@
 
     /** return true if all users can read from this file */
     public boolean allCanRead() {
-        return allPermissions.getRead();
+        return worldPermissions.getRead();
     }
 
     /** return true if all users can write into this file */
     public boolean allCanWrite() {
-        return allPermissions.getWrite();
+        return worldPermissions.getWrite();
     }
 
     /** return true of all users can execute the current file */
     public boolean allCanExecute() {
-        return allPermissions.getExecute();
+        return worldPermissions.getExecute();
     }
 
     /** represents the entire grid file properties as a string */

Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/PermissionsImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/PermissionsImpl.java	2008-09-30 16:39:31 UTC (rev 2196)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/PermissionsImpl.java	2008-09-30 16:40:55 UTC (rev 2197)
@@ -20,6 +20,12 @@
     public PermissionsImpl() {
     }
 
+    public PermissionsImpl(int digit) {
+        readable = (digit & 4) != 0;
+        writable = (digit & 2) != 0;
+        executable = (digit & 1) != 0;
+    }
+
     /** set/unset readable */
     public void setRead(boolean canRead) {
         this.readable = canRead;
@@ -50,20 +56,14 @@
         return this.executable;
     }
 
-    /** return a string representation of the mode. Pattern 777 */
+    /**
+     * Returns a string representing the octal digit of this permission
+     */
     public String toString() {
-        String mode = getVal(getRead()) + getVal(getWrite())
-                + getVal(getExecute());
-        return String.valueOf((Integer.parseInt(mode, 2)));
+        return String.valueOf(toDigit());
     }
 
-    /** return 1 if value = true, else return 0 */
-    private String getVal(boolean value) {
-        if (value == true) {
-            return "1";
-        }
-        else {
-            return "0";
-        }
+    public int toDigit() {
+        return (readable ? 4 : 0) + (writable ? 2 : 0) + (executable ? 1 : 0);
     }
 }

Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/UnixPermissionsImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/UnixPermissionsImpl.java	2008-09-30 16:39:31 UTC (rev 2196)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/UnixPermissionsImpl.java	2008-09-30 16:40:55 UTC (rev 2197)
@@ -60,4 +60,8 @@
     public boolean getExecute() {
         return (value & 1) != 0;
     }
+
+    public int toDigit() {
+        return value;
+    }   
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.