Author: bpapez
Date: Wed Jun 6 17:48:58 2007
New Revision: 17495
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17495&repname=
=3Djahia
Log:
slight refactoring of getidintype
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/CategoryKe=
y.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContainerD=
efinitionKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerListKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentFie=
ldKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentPag=
eKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/FieldDefin=
itionKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/PageDefini=
tionKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/version/R=
evisionEntrySetComparator.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/version/R=
evisionsComparator.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cate=
goryKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/CategoryKey.java&rev=3D17495&repnam=
e=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/CategoryKe=
y.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/CategoryKe=
y.java Wed Jun 6 17:48:58 2007
@@ -39,7 +39,7 @@
}
=
public int getCategoryID() {
- return Integer.parseInt(getIDInType());
+ return getIdInType();
}
=
public static ObjectKey getChildInstance(String IDInType) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
ainerDefinitionKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContainerDefinitionKey.java&rev=3D1=
7495&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContainerD=
efinitionKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContainerD=
efinitionKey.java Wed Jun 6 17:48:58 2007
@@ -38,7 +38,7 @@
}
=
public int getCtnDefID() {
- return Integer.parseInt(getIDInType());
+ return getIdInType();
}
=
public static ObjectKey getChildInstance(String IDInType) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entContainerKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentContainerKey.java&rev=3D1749=
5&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerKey.java Wed Jun 6 17:48:58 2007
@@ -37,7 +37,7 @@
}
=
public int getContainerID() {
- return Integer.parseInt(getIDInType());
+ return getIdInType();
}
=
public static ObjectKey getChildInstance(String IDInType) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entContainerListKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentContainerListKey.java&rev=3D=
17495&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerListKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerListKey.java Wed Jun 6 17:48:58 2007
@@ -38,7 +38,7 @@
}
=
public int getContainerListID() {
- return Integer.parseInt(getIDInType());
+ return getIdInType();
}
=
public static ObjectKey getChildInstance(String IDInType) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entFieldKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentFieldKey.java&rev=3D17495&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentFie=
ldKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentFie=
ldKey.java Wed Jun 6 17:48:58 2007
@@ -40,7 +40,7 @@
}
=
public int getFieldID() {
- return Integer.parseInt(getIDInType());
+ return getIdInType();
}
=
public static ObjectKey getChildInstance(String IDInType) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entObject.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentObject.java&rev=3D17495&repn=
ame=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java Wed Jun 6 17:48:58 2007
@@ -751,8 +751,8 @@
public boolean checkAccess(JahiaUser user, int permission, boolean che=
ckChilds) {
boolean result =3D false;
try {
- JahiaBaseACL acl =3D getACL();
- result =3D acl.getPermission (user, permission);
+ JahiaBaseACL localAcl =3D getACL();
+ result =3D localAcl.getPermission (user, permission);
if(!result&& checkChilds) {
List childs =3D getChilds(user, null);
for (int i =3D 0; i < childs.size() && !result; i++) {
@@ -1348,6 +1348,7 @@
*
*/
public void syncClusterOnValidation(){
+
long now =3D System.currentTimeMillis();
if ( now-lastClusterSyncTime>3000 ){
lastClusterSyncTime =3D now; =
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entPageKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentPageKey.java&rev=3D17495&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentPag=
eKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentPag=
eKey.java Wed Jun 6 17:48:58 2007
@@ -51,7 +51,7 @@
}
=
public int getPageID() {
- return Integer.parseInt(getIDInType());
+ return getIdInType();
}
=
public static ObjectKey getChildInstance(String IDInType) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Fiel=
dDefinitionKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/FieldDefinitionKey.java&rev=3D17495=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/FieldDefin=
itionKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/FieldDefin=
itionKey.java Wed Jun 6 17:48:58 2007
@@ -38,7 +38,7 @@
}
=
public int getFieldID() {
- return Integer.parseInt(getIDInType());
+ return getIdInType();
}
=
public static ObjectKey getChildInstance(String IDInType) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Page=
DefinitionKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/PageDefinitionKey.java&rev=3D17495&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/PageDefini=
tionKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/PageDefini=
tionKey.java Wed Jun 6 17:48:58 2007
@@ -38,7 +38,7 @@
}
=
public int getPageDefID() {
- return Integer.parseInt(getIDInType());
+ return getIdInType();
}
=
public static ObjectKey getChildInstance(String IDInType) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/ver=
sion/RevisionEntrySetComparator.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/version/RevisionEntrySetComparator=
.java&rev=3D17495&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/version/R=
evisionEntrySetComparator.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/version/R=
evisionEntrySetComparator.java Wed Jun 6 17:48:58 2007
@@ -100,8 +100,8 @@
return title2.compareTo(title1);
}
} else if (this.sortAttribute =3D=3D RevisionEntrySetComparator.SO=
RT_BY_DESCR ) {
- String descr1 =3D (String)rev1.getDescription(this.languageCod=
e);
- String descr2 =3D (String)rev2.getDescription(this.languageCod=
e);
+ String descr1 =3D rev1.getDescription(this.languageCode);
+ String descr2 =3D rev2.getDescription(this.languageCode);
if ( this.sortOrder =3D=3D RevisionEntrySetComparator.ASC_ORDE=
R ){
return descr1.compareTo(descr2);
} else {
@@ -117,12 +117,12 @@
res =3D (obj2.compareTo(obj1));
}
if ( res =3D=3D 0 ){
- Integer I1 =3D new Integer(rev1.getObjectKey().getIDInType=
());
- Integer I2 =3D new Integer(rev2.getObjectKey().getIDInType=
());
+ int i1 =3D rev1.getObjectKey().getIdInType();
+ int i2 =3D rev2.getObjectKey().getIdInType();
if ( this.sortOrder =3D=3D RevisionEntrySetComparator.ASC_=
ORDER ){
- res =3D (I1.compareTo(I2));
+ res =3D i1<i2 ? -1 : (i1=3D=3Di2 ? 0 : 1);
} else {
- res =3D (I2.compareTo(I1));
+ res =3D i2<i1 ? -1 : (i1=3D=3Di2 ? 0 : 1);
}
}
return res;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/ver=
sion/RevisionsComparator.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/version/RevisionsComparator.java&r=
ev=3D17495&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/version/R=
evisionsComparator.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/version/R=
evisionsComparator.java Wed Jun 6 17:48:58 2007
@@ -121,12 +121,12 @@
res =3D (obj2.compareTo(obj1));
}
if ( res =3D=3D 0 ){
- Integer I1 =3D new Integer(rev1.getObjectKey().getIDInType=
());
- Integer I2 =3D new Integer(rev2.getObjectKey().getIDInType=
());
+ int i1 =3D rev1.getObjectKey().getIdInType();
+ int i2 =3D rev2.getObjectKey().getIdInType();
if ( this.sortOrder =3D=3D RevisionsComparator.ASC_ORDER ){
- res =3D (I1.compareTo(I2));
+ res =3D i1<i2 ? -1 : (i1=3D=3Di2 ? 0 : 1);
} else {
- res =3D (I2.compareTo(I1));
+ res =3D i2<i1 ? -1 : (i1=3D=3Di2 ? 0 : 1);
}
}
return res;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
