tdraier 2005/12/21 14:38:33 CET
Modified files:
core/src/java/org/jahia/content ContentObject.java
core/src/java/org/jahia/services/containers
ContentContainer.java
ContentContainerList.java
core/src/java/org/jahia/services/fields ContentField.java
core/src/java/org/jahia/services/pages ContentPage.java
Log:
get/setProperty methods in oo fashion
Revision Changes Path
1.30 +7 -2 jahia/core/src/java/org/jahia/content/ContentObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ContentObject.java.diff?r1=1.29&r2=1.30&f=h
1.25 +10 -0
jahia/core/src/java/org/jahia/services/containers/ContentContainer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/containers/ContentContainer.java.diff?r1=1.24&r2=1.25&f=h
1.17 +11 -1
jahia/core/src/java/org/jahia/services/containers/ContentContainerList.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/containers/ContentContainerList.java.diff?r1=1.16&r2=1.17&f=h
1.43 +9 -0
jahia/core/src/java/org/jahia/services/fields/ContentField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/fields/ContentField.java.diff?r1=1.42&r2=1.43&f=h
1.45 +11 -0
jahia/core/src/java/org/jahia/services/pages/ContentPage.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/pages/ContentPage.java.diff?r1=1.44&r2=1.45&f=h
Index: ContentObject.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentObject.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ContentObject.java 6 Dec 2005 12:12:58 -0000 1.29
+++ ContentObject.java 21 Dec 2005 13:38:32 -0000 1.30
@@ -699,7 +699,7 @@
public boolean checkAccess(JahiaUser user, int permission) {
boolean result = false;
try {
- JahiaBaseACL acl = new JahiaBaseACL(getAclID());
+ JahiaBaseACL acl = getACL();
result = acl.getPermission (user, permission);
} catch (JahiaException ex) {
logger.debug("Cannot load ACL ID " + getAclID(), ex);
@@ -1120,7 +1120,8 @@
public JahiaBaseACL getACL () {
if (acl == null) {
try {
- acl = new JahiaBaseACL (getAclID ());
+// acl = new JahiaBaseACL (getAclID ());
+ acl = JahiaBaseACL.getACL(getAclID(), this);
} catch (Throwable t) {
t.printStackTrace ();
}
@@ -1651,4 +1652,8 @@
// do nothing by default
}
+
+ public abstract String getProperty(String name) throws JahiaException;
+
+ public abstract void setProperty(String name, String val) throws
JahiaException;
}
Index: ContentContainer.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/containers/ContentContainer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ContentContainer.java 8 Dec 2005 10:56:47 -0000 1.24
+++ ContentContainer.java 21 Dec 2005 13:38:32 -0000 1.25
@@ -1107,5 +1107,15 @@
htmlCache.invalidatePageEntries(String.valueOf(this.getPageID()),EntryLoadRequest.STAGING_WORKFLOW_STATE);
}
+ public String getProperty(String name) throws JahiaException {
+ return (String)
ServicesRegistry.getInstance().getJahiaContainersService().getContainerProperties(getID()).get(name);
+ }
+
+ public void setProperty(String name, String val) throws JahiaException {
+ Map p =
ServicesRegistry.getInstance().getJahiaContainersService().getContainerProperties(getID());
+ p.put(name,val);
+
ServicesRegistry.getInstance().getJahiaContainersService().setContainerProperties(getID(),
getSiteID(), p);
+ }
+
}
Index: ContentContainerList.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/containers/ContentContainerList.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ContentContainerList.java 6 Dec 2005 12:11:34 -0000 1.16
+++ ContentContainerList.java 21 Dec 2005 13:38:32 -0000 1.17
@@ -673,5 +673,15 @@
child.updateContentPagePath(context);
}
}
-
+
+ public String getProperty(String name) throws JahiaException {
+ return (String)
ServicesRegistry.getInstance().getJahiaContainersService().getContainerListProperties(getID()).get(name);
+ }
+
+ public void setProperty(String name, String val) throws JahiaException {
+ Map p =
ServicesRegistry.getInstance().getJahiaContainersService().getContainerListProperties(getID());
+ p.put(name,val);
+
ServicesRegistry.getInstance().getJahiaContainersService().setContainerListProperties(getID(),
getSiteID(), p);
+ }
+
}
Index: ContentField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/fields/ContentField.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ContentField.java 13 Dec 2005 14:06:10 -0000 1.42
+++ ContentField.java 21 Dec 2005 13:38:33 -0000 1.43
@@ -2075,4 +2075,13 @@
}
return pagePath;
}
+
+ public String getProperty(String name) throws JahiaException {
+ return (String) getProperties().get(name);
+ }
+
+ public void setProperty(String name, String val) throws JahiaException {
+ getProperties().put(name, val);
+ storeProperties();
+ }
}
Index: ContentPage.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/pages/ContentPage.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ContentPage.java 6 Dec 2005 12:12:34 -0000 1.44
+++ ContentPage.java 21 Dec 2005 13:38:33 -0000 1.45
@@ -2137,6 +2137,17 @@
}
}
+
+ public String getProperty(String name) throws JahiaException {
+ PageProperty pageLocalProperty = getPageLocalProperty(name);
+ if (pageLocalProperty == null) {
+ return null;
+ } else {
+ return (String) pageLocalProperty.getValue();
+ }
+
+ }
+
/**
* Sets a page property value. This updates both the in-memory and
* persistant systems simultaneously so it might have a performance
