dpillot 2005/12/15 17:11:07 CET
Modified files:
core/src/java/org/jahia/gui HTMLToolBox.java
Log:
fix npe on getPickedObject method
Revision Changes Path
1.39 +14 -9 jahia/core/src/java/org/jahia/gui/HTMLToolBox.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java.diff?r1=1.38&r2=1.39&f=h
Index: HTMLToolBox.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- HTMLToolBox.java 23 Nov 2005 17:44:09 -0000 1.38
+++ HTMLToolBox.java 15 Dec 2005 16:11:07 -0000 1.39
@@ -60,7 +60,7 @@
* Modified and cleaned by Xavier Lawrence
* MC modified and cleaned Xavier Lawrence
*
- * @version $Id: HTMLToolBox.java,v 1.38 2005/11/23 17:44:09 shuber Exp $
+ * @version $Id: HTMLToolBox.java,v 1.39 2005/12/15 16:11:07 dpillot Exp $
*/
public class HTMLToolBox {
@@ -1307,28 +1307,28 @@
//check for special status:picked/picker
String pickedID = "";
- ContentContainer cc;//the current container
+ final ContentContainer cc;//the current container
+ String pickedpageID="";
ContentObject pickedObject;// the source of the linked copy(the
picked)
try {
cc = ContentContainer.getContainer(objectKey);
if (cc!=null && cc.getPickerObjects()!=null &&
cc.getPickerObjects().size() > 0) {
+ //this container is picked
int pickersize = cc.getPickerObjects().size();
resource = resource + " ("+getResource(resourceBundle,
"numbercopies")+":" + pickersize + ")";
buff.append(" src=\"").append(picto).append("\"
alt=\"").append(resource).
append("\"").append("
title=\"").append(resource).append("\" border=\"0\"/>");
- } else if (contentObject.isPicker()) {
+ } else if (cc!=null && contentObject.isPicker() &&
cc.getPickedObject()!=null) {
// picker status of object
-
-
pickedObject = cc.getPickedObject();
pickedID = "" + pickedObject.getID();
resource = resource + " ("+getResource(resourceBundle,
"copylinkid")+":" + pickedID + ")";
- /*
- unused (relative to ability to display beside the action
icon if needed)
- pickedpageID=""+((ContentContainer)pickedObject).getPageID();
- */
+ //unused (relative to ability to display beside the action
icon if needed)
+
+
//pickedpageID=""+((ContentContainer)pickedObject).getPageID();
+
buff.append("
src=\"").append(getURLImageContext()).append("/picker.gif").append("\"
alt=\"").append(resource).
append("\"").append("
title=\"").append(resource).append("\" border=\"0\"/>");
@@ -1546,6 +1546,9 @@
}
/**
* $Log: HTMLToolBox.java,v $
+ * Revision 1.39 2005/12/15 16:11:07 dpillot
+ * fix npe on getPickedObject method
+ *
* Revision 1.38 2005/11/23 17:44:09 shuber
* New ID generator that's cluster and transactional compatible
*
