* Rename style 'ImageRenderer' to 'Image' 44/6844/1
authorVincent COUVERT <vincent.couvert@scilab.org>
Mon, 2 Apr 2012 14:33:38 +0000 (16:33 +0200)
committerVincent COUVERT <vincent.couvert@scilab.org>
Mon, 2 Apr 2012 14:33:38 +0000 (16:33 +0200)
commit2e7c93a7dccd5bb4611e14e5a40e15772c148d6a
tree1716a2c3545be781a24bf374587a416f99b9797c
parenta91b1697caf23597c5bd511d205b3545c2e5c9b4
* Rename style 'ImageRenderer' to 'Image'

* 'uiimage' used in Java code to avoid conflicts with java.awt.Image

* Clean/remove old bridge system for 'Image' uicontrols.

Change-Id: Ic33df4735f336d8302236ad22de44f7ee7f08678
40 files changed:
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicModel/GraphicModel.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/Uicontrol.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/uiimage/UiImage.java [moved from scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/imagerenderer/ImageRenderer.java with 76% similarity]
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/includes/ObjectStructure.h
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/demos/uicontrol_image.dem.sce
scilab/modules/gui/help/en_US/uicontrol.xml
scilab/modules/gui/includes/ImageRenderer.h [deleted file]
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/src/c/CreateUIControl.c
scilab/modules/gui/src/c/UicontrolStyleToString.c
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/cpp/ImageRenderer.cpp [deleted file]
scilab/modules/gui/src/cpp/ImageRenderer.hxx [deleted file]
scilab/modules/gui/src/cpp/SetUicontrolParent.cpp
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewWidget.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/uiimage/SwingScilabUiImage.java [moved from scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/imagerenderer/SwingScilabImageRenderer.java with 84% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/imagerenderer/ImageRenderer.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/imagerenderer/ScilabImageRenderer.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/imagerenderer/ScilabImageRendererBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/tab/ScilabTabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/tab/SimpleTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/uiimage/SimpleUiImage.java [moved from scilab/modules/gui/src/java/org/scilab/modules/gui/imagerenderer/SimpleImageRenderer.java with 81% similarity]
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.giws.xml
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/gui/tests/unit_tests/image.dia.ref [moved from scilab/modules/gui/tests/unit_tests/imagerenderer.dia.ref with 77% similarity]
scilab/modules/gui/tests/unit_tests/image.tst [moved from scilab/modules/gui/tests/unit_tests/imagerenderer.tst with 77% similarity]
scilab/modules/renderer/src/jni/CallRenderer.cpp
scilab/modules/renderer/src/jni/CallRenderer.hxx