dpillot 2005/11/15 16:35:08 CET
Modified files:
core/src/java/org/jahia/gui HTMLToolBox.java
Log:
pickers/picked support
Revision Changes Path
1.35 +36 -18 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.34&r2=1.35&f=h
Index: HTMLToolBox.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- HTMLToolBox.java 14 Nov 2005 16:35:02 -0000 1.34
+++ HTMLToolBox.java 15 Nov 2005 15:35:08 -0000 1.35
@@ -60,7 +60,7 @@
* Modified and cleaned by Xavier Lawrence
* MC modified and cleaned Xavier Lawrence
*
- * @version $Id: HTMLToolBox.java,v 1.34 2005/11/14 16:35:02 dpillot Exp $
+ * @version $Id: HTMLToolBox.java,v 1.35 2005/11/15 15:35:08 dpillot Exp $
*/
public class HTMLToolBox {
@@ -1301,32 +1301,47 @@
out.print("')\"><img\n");
String resource = getResource(resourceBundle, objectType +
"Operations");
+
+ //check for special status:picked/picker
String pickedID = "";
- String pickedpageID="";
- if (!contentObject.isPicker()) {
- buff.append(" src=\"").append(picto).append("\"
alt=\"").append(resource).
- append("\"").append("
title=\"").append(resource).append("\" border=\"0\"/>");
- } else {
- // picker status of object
+ ContentContainer cc;//the current container
+ 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) {
+ int pickersize = cc.getPickerObjects().size();
+ resource = resource + " ("+getResource(resourceBundle,
"numbercopies")+":" + pickersize + ")";
+ buff.append("
src=\"").append(getURLImageContext()).append("/picked.gif").append("\"
alt=\"").append(resource).
+ append("\"").append("
title=\"").append(resource).append("\" border=\"0\"/>");
+
+ } else if (contentObject.isPicker()) {
+ // picker status of object
+
- ContentContainer cc;//the current container
- ContentObject pickedObject;// the source of the linked copy(the
picked)
- try {
- cc = ContentContainer.getContainer(objectKey);
pickedObject = cc.getPickedObject();
pickedID = "" + pickedObject.getID();
- resource = resource+" (linked copy of object id:"+
pickedID+")";
+ resource = resource + " ("+getResource(resourceBundle,
"copylinkid")+":" + pickedID + ")";
/*
unused (relative to ability to display beside the action
icon if needed)
pickedpageID=""+((ContentContainer)pickedObject).getPageID();
*/
- } catch (JahiaException e) {
- logger.error(e);
+ buff.append("
src=\"").append(getURLImageContext()).append("/picker.gif").append("\"
alt=\"").append(resource).
+ append("\"").append("
title=\"").append(resource).append("\" border=\"0\"/>");
+
+
+ } else {
+ // standard objects
+ buff.append(" src=\"").append(picto).append("\"
alt=\"").append(resource).
+ append("\"").append("
title=\"").append(resource).append("\" border=\"0\"/>");
}
- buff.append("
src=\"").append(getURLImageContext()).append("/picker.gif").append("\"
alt=\"").append(resource).
+ } catch (JahiaException e) {
+ logger.debug(e);
+ // standard objects
+ buff.append(" src=\"").append(picto).append("\"
alt=\"").append(resource).
append("\"").append("
title=\"").append(resource).append("\" border=\"0\"/>");
}
+
out.println(buff.toString());
buff.delete(0, buff.length());
@@ -1527,9 +1542,12 @@
}
/**
- * $Log: HTMLToolBox.java,v $
- * Revision 1.34 2005/11/14 16:35:02 dpillot
- * picker status display
- *
- *
- */
\ No newline at end of file
+ * $Log: HTMLToolBox.java,v $
+ * Revision 1.35 2005/11/15 15:35:08 dpillot
+ * pickers/picked support
+ *
+ * Revision 1.34 2005/11/14 16:35:02 dpillot
+ * picker status display
+ *
+ *
+ */
\ No newline at end of file
