r1560 - in xwiki-apps/gelc/gelcv1/trunk: . gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets
Ludovic Dubost
ludovic at users.forge.objectweb.org
Wed Nov 15 02:19:39 CET 2006
Author: ludovic
Date: 2006-11-15 02:19:33 +0100 (Wed, 15 Nov 2006)
New Revision: 1560
Modified:
xwiki-apps/gelc/gelcv1/trunk/gelc.iws
xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
Log:
Fix JIRA CURRIKI-86 rights constants which have changed and broke rights assignement
Modified: xwiki-apps/gelc/gelcv1/trunk/gelc.iws
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelc.iws 2006-11-15 01:05:27 UTC (rev 1559)
+++ xwiki-apps/gelc/gelcv1/trunk/gelc.iws 2006-11-15 01:19:33 UTC (rev 1560)
@@ -185,7 +185,7 @@
<file leaf-file-name="DateClass.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/xwiki/core/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="166" column="21" selection-start="5195" selection-end="5195" vertical-scroll-proportion="0.030797102">
+ <state line="166" column="21" selection-start="5195" selection-end="5195" vertical-scroll-proportion="0.031716418">
<folding />
</state>
</provider>
@@ -194,7 +194,7 @@
<file leaf-file-name="calendar.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/xwiki/web/standard/src/main/webapp/yui/calendar/calendar.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="1028" column="63" selection-start="34119" selection-end="34119" vertical-scroll-proportion="0.031657357">
+ <state line="1028" column="63" selection-start="34119" selection-end="34119" vertical-scroll-proportion="0.032629557">
<folding />
</state>
</provider>
@@ -203,16 +203,25 @@
<file leaf-file-name="AssetManagerPlugin.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="8" selection-start="2402" selection-end="2402" vertical-scroll-proportion="0.031657357">
+ <state line="117" column="46" selection-start="4737" selection-end="4737" vertical-scroll-proportion="0.5220729">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="Document.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/xwiki/core/src/main/java/com/xpn/xwiki/api/Document.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1034" column="28" selection-start="33654" selection-end="33654" vertical-scroll-proportion="0.33205375">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="AssetConstant.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetConstant.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="64" column="66" selection-start="2970" selection-end="2970" vertical-scroll-proportion="0.6331471">
+ <state line="64" column="66" selection-start="2970" selection-end="2970" vertical-scroll-proportion="0.65259117">
<folding />
</state>
</provider>
@@ -221,7 +230,7 @@
<file leaf-file-name="xwiki.cfg" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/xwiki/web/standard/src/main/webapp/WEB-INF/xwiki.cfg">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="0" selection-start="3753" selection-end="3753" vertical-scroll-proportion="1.2420857">
+ <state line="76" column="0" selection-start="3753" selection-end="3753" vertical-scroll-proportion="1.2802303">
<folding />
</state>
</provider>
@@ -230,19 +239,12 @@
<file leaf-file-name="xwiki.cfg" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gelc/src/main/web/WEB-INF/xwiki.cfg">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="29" selection-start="2757" selection-end="2757" vertical-scroll-proportion="0.5623836">
+ <state line="52" column="29" selection-start="2757" selection-end="2757" vertical-scroll-proportion="0.5796545">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="calx.gif" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/xwiki/web/standard/src/main/webapp/yui/calendar/assets/calx.gif">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- </file>
<file leaf-file-name="calendar.css" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/xwiki/web/standard/src/main/webapp/yui/calendar/assets/calendar.css">
<provider selected="true" editor-type-id="text-editor">
@@ -264,7 +266,7 @@
<file leaf-file-name="DateMetaClass.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/xwiki/core/src/main/java/com/xpn/xwiki/objects/meta/DateMetaClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="34" selection-start="2060" selection-end="2060" vertical-scroll-proportion="0.7916667">
+ <state line="55" column="34" selection-start="2060" selection-end="2060" vertical-scroll-proportion="0.8152985">
<folding />
</state>
</provider>
@@ -907,7 +909,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="1" y="1" width="1678" height="954" extended-state="1" />
+ <frame x="1" y="1" width="1678" height="954" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
@@ -1030,13 +1032,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/xwiki/core/src/main/java/com/xpn/xwiki/api/Document.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1300" column="31" selection-start="43485" selection-end="43485" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/xwiki/core/src/main/java/com/xpn/xwiki/web/UploadAction.java">
<provider selected="true" editor-type-id="text-editor">
<state line="65" column="0" selection-start="2655" selection-end="2655" vertical-scroll-proportion="0.021683674">
@@ -1075,49 +1070,56 @@
</entry>
<entry file="file://$PROJECT_DIR$/xwiki/core/src/main/java/com/xpn/xwiki/objects/meta/DateMetaClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="34" selection-start="2060" selection-end="2060" vertical-scroll-proportion="0.7916667">
+ <state line="55" column="34" selection-start="2060" selection-end="2060" vertical-scroll-proportion="0.8152985">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/xwiki/core/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="166" column="21" selection-start="5195" selection-end="5195" vertical-scroll-proportion="0.030797102">
+ <state line="166" column="21" selection-start="5195" selection-end="5195" vertical-scroll-proportion="0.031716418">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/xwiki/web/standard/src/main/webapp/yui/calendar/calendar.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="1028" column="63" selection-start="34119" selection-end="34119" vertical-scroll-proportion="0.031657357">
+ <state line="1028" column="63" selection-start="34119" selection-end="34119" vertical-scroll-proportion="0.032629557">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/xwiki/web/standard/src/main/webapp/WEB-INF/xwiki.cfg">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="0" selection-start="3753" selection-end="3753" vertical-scroll-proportion="1.2420857">
+ <state line="76" column="0" selection-start="3753" selection-end="3753" vertical-scroll-proportion="1.2802303">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gelc/src/main/web/WEB-INF/xwiki.cfg">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="29" selection-start="2757" selection-end="2757" vertical-scroll-proportion="0.5623836">
+ <state line="52" column="29" selection-start="2757" selection-end="2757" vertical-scroll-proportion="0.5796545">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/xwiki/core/src/main/java/com/xpn/xwiki/api/Document.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1034" column="28" selection-start="33654" selection-end="33654" vertical-scroll-proportion="0.33205375">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetConstant.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="64" column="66" selection-start="2970" selection-end="2970" vertical-scroll-proportion="0.6331471">
+ <state line="64" column="66" selection-start="2970" selection-end="2970" vertical-scroll-proportion="0.65259117">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="8" selection-start="2402" selection-end="2402" vertical-scroll-proportion="0.031657357">
+ <state line="117" column="46" selection-start="4737" selection-end="4737" vertical-scroll-proportion="0.5220729">
<folding />
</state>
</provider>
Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java 2006-11-15 01:05:27 UTC (rev 1559)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java 2006-11-15 01:19:33 UTC (rev 1560)
@@ -115,7 +115,7 @@
asset.removeObjects("XWiki.XWikiRights");
asset.use(ASSET_CLASS_FULLNAME);
- String right = (String) asset.get(ASSET_ITEM_RIGHT);
+ String right = (String) asset.getValue(ASSET_ITEM_RIGHT);
Object obj = asset.newObject("XWiki.XWikiRights");
asset.use(obj);
More information about the Xwiki-notifications
mailing list