Author: sshyrkov
Date: Fri Sep 21 15:25:06 2007
New Revision: 18622
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18622&repname=
=3Djahia
Log:
Constant added for the 'hardcodedLink' link type
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Structural=
Relationship.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/deletecont=
ainer/DeleteContainer_Engine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/rights/Man=
ageRights.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Stru=
cturalRelationship.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/StructuralRelationship.java&rev=3D1=
8622&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/Structural=
Relationship.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Structural=
Relationship.java Fri Sep 21 15:25:06 2007
@@ -32,5 +32,6 @@
public static final String CONTENT_LINK =3D "content_relationship";
public static final String ACTIVATION_PICKER_LINK =3D "activation_pick=
er_relationship";
public static final String CHANGE_PICKER_LINK =3D "change_picker_relat=
ionship";
+ public static final String HARDCODED_LINK =3D "hardcodedLink"; =
=
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/dele=
tecontainer/DeleteContainer_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/deletecontainer/DeleteContainer_Eng=
ine.java&rev=3D18622&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/engines/deletecont=
ainer/DeleteContainer_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/deletecont=
ainer/DeleteContainer_Engine.java Fri Sep 21 15:25:06 2007
@@ -604,7 +604,7 @@
private Set contentObjectPointingOnPage(int pageID)
throws JahiaException {
List objectLinks =3D ObjectLink.findByTypeAndRightObjectKey(
- "hardcodedLink", new ContentPageKey(pageID));
+ StructuralRelationship.HARDCODED_LINK, new ContentPageKey(=
pageID));
Iterator objectLinkIter =3D objectLinks.iterator();
Set objectKeysPointingToPage =3D new HashSet();
while (objectLinkIter.hasNext()) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/righ=
ts/ManageRights.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/rights/ManageRights.java&rev=3D1862=
2&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/engines/rights/Man=
ageRights.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/rights/Man=
ageRights.java Fri Sep 21 15:25:06 2007
@@ -803,7 +803,7 @@
=
private void goForIt(final int pageID, final Map result) throws JahiaE=
xception {
final List objectLinks =3D ObjectLink.findByTypeAndRightObjectKey(
- "hardcodedLink", new ContentPageKey(pageID));
+ StructuralRelationship.HARDCODED_LINK, new ContentPageKey(=
pageID));
final Iterator objectLinkIter =3D objectLinks.iterator();
final Set set =3D new HashSet();
while (objectLinkIter.hasNext()) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/BigText_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/BigText_Field.java&rev=3D186=
22&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/engines/shared/Big=
Text_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java Fri Sep 21 15:25:06 2007
@@ -28,6 +28,7 @@
import org.jahia.content.ContentFieldKey;
import org.jahia.content.ContentPageKey;
import org.jahia.content.ObjectLink;
+import org.jahia.content.StructuralRelationship;
import org.jahia.data.containers.JahiaContainer;
import org.jahia.data.containers.JahiaContainerList;
import org.jahia.data.fields.*;
@@ -436,7 +437,7 @@
=
// first we remove all the existing references for this object.
final List references =3D ObjectLink.findByTypeAndLeftObjectKe=
y(
- "hardcodedLink", fieldKey);
+ StructuralRelationship.HARDCODED_LINK, fieldKey);
final Iterator refIterator =3D references.iterator();
while (refIterator.hasNext()) {
final ObjectLink curLink =3D (ObjectLink) refIterator.next=
();
@@ -449,7 +450,7 @@
if (logger.isDebugEnabled())
logger.debug("Found reference to page " + curPageIDInt + "=
in this bigtext");
ObjectLink.createLink(fieldKey,
- new ContentPageKey(curPageIDInt.intValue()), "hard=
codedLink",
+ new ContentPageKey(curPageIDInt.intValue()), Struc=
turalRelationship.HARDCODED_LINK,
new HashMap());
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/imp=
ortexport/ImportExportBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/importexport/ImportExportBaseServi=
ce.java&rev=3D18622&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/importexp=
ort/ImportExportBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java Fri Sep 21 15:25:06 2007
@@ -157,7 +157,7 @@
structRelations.add(StructuralRelationship.METADATADEFINITION_LINK=
);
structRelations.add("category");
structRelations.add("reference");
- structRelations.add("hardcodedLink");
+ structRelations.add(StructuralRelationship.HARDCODED_LINK);
}
=
public void stop() {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
