[Openutils-svn] SF.net SVN: openutils:[1009] trunk/openutils-mgnlmedia

[<fg...@us...>]

Revision: 1009
          http://openutils.svn.sourceforge.net/openutils/?rev=1009&view=rev
Author:   fgiust
Date:     2009-02-15 23:12:20 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
merged back from branch

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl

Property Changed:
----------------
    trunk/openutils-mgnlmedia/
    trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/


Property changes on: trunk/openutils-mgnlmedia
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/openutils-mgnlmedia-3.6.x:1-982
   + /branches/openutils-mgnlmedia-3.6.x:1-982,1004
Added: svn:mergeinfo
   + /branches/openutils-mgnlmedia-3.6.x:1004

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java	2009-02-15 22:52:12 UTC (rev 1008)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java	2009-02-15 23:12:20 UTC (rev 1009)
@@ -140,8 +140,8 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     @SuppressWarnings("unchecked")
-    @Override
     public boolean onPostSave(Content media)
     {
         Collection<NodeData> nds = media.getNodeDataCollection("tags-*");


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl	2009-02-15 22:52:12 UTC (rev 1008)
+++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl	2009-02-15 23:12:20 UTC (rev 1009)
@@ -1,10 +1,10 @@
      <!-- line for moving to the bottom -->
     <div id="${lineId}" class="mgnlTreeLineInter mgnlLineEnabled" onmouseover="${tree.javascriptTree}.moveNodeHighlightLine('${lineId}');" onmouseout="${tree.javascriptTree}.moveNodeResetLine('${lineId}');"
         onmousedown="${tree.javascriptTree}.pasteNode('${tree.path}',${PASTETYPE_SUB},${permissionWrite?string},'${lineId}');"></div>
-    
+
     <!-- this is needed for IE else you can't scroll. Do not ask me why! -->
     <div style="position:absolute;" >&nbsp;</div>
-    
+
     <!-- do we have write permission on the root? -->
     <input type="hidden" name="${tree.javascriptTree}_${tree.path}_PermissionWrite" id="${tree.javascriptTree}_${tree.path}_PermissionWrite" value="${permissionWrite?string}" />
 


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang:1004


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.