Tagging 1.7 release.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/batik/tags/batik-1_7@608260 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index 6e957a4..a36e179 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,11 +12,11 @@
26815, 28344, 35165, 36570, 37496, 38498, 40163, 40727, 41205,
41820, 41947, 41955, 41988, 42014, 42021, 42032, 42075, 42118,
42137, 42168, 42169, 42196, 42209, 42210, 42212, 42221, 42228,
- 42255, 42258, 42312, 42333, 42381, 42386, 42479, 42504, 42505,
- 42543, 42645, 42651, 42697, 42698, 42807, 42961, 42963, 42968,
- 43022, 43043, 43045, 43165, 43194, 43195, 43370, 43418, 43446,
- 43638, 43657, 43744, 43760, 43764, 43787, 43854, 43871, 43904,
- 43953, 44029, 44054, 44092
+ 42255, 42258, 42311, 42312, 42333, 42381, 42386, 42479, 42504,
+ 42505, 42543, 42645, 42651, 42697, 42698, 42807, 42961, 42963,
+ 442968, 3022, 43043, 43045, 43165, 43194, 43195, 43370, 43418,
+ 443446, 3638, 43657, 43744, 43760, 43764, 43787, 43854, 43871,
+ 443904, 3953, 44029, 44054, 44092, 44146
2. New features
@@ -105,6 +105,7 @@
* Fixed bug in CSS class name matching, which occured only when an
element was declared to be a member of multiple classes, where one
is a prefix of another.
+ * Fixed bug on OS X where the zoom interactor overlay was not shown.
5. Misc
diff --git a/build.xml b/build.xml
index 8133f1b..cf6146e 100644
--- a/build.xml
+++ b/build.xml
@@ -82,7 +82,7 @@
</tstamp>
<property name="Project" value="Apache Batik"/>
<property name="project" value="batik"/>
- <property name="year" value="2007"/>
+ <property name="year" value="2008"/>
<property name="version" value="1.7"/>
<property name="revisionType" value=""/>
<property name="revisionNumber" value=""/>
@@ -399,6 +399,7 @@
<include name="build.bat"/>
<include name="build.sh"/>
<include name="build.xml"/>
+ <include name="forrest.properties"/>
<include name="svn-revision"/>
<include name="contrib/**"/>
<include name="lib/**"/>
@@ -467,6 +468,7 @@
<include name="build.bat"/>
<include name="build.sh"/>
<include name="build.xml"/>
+ <include name="forrest.properties"/>
<include name="svn-revision"/>
<include name="contrib/**"/>
<include name="documentation-sources/**"/>
diff --git a/documentation-sources/skinconf.xml b/documentation-sources/skinconf.xml
index 1896158..3763942 100644
--- a/documentation-sources/skinconf.xml
+++ b/documentation-sources/skinconf.xml
@@ -94,7 +94,7 @@
<favicon-url></favicon-url>
<!-- The following are used to construct a copyright statement -->
- <year>2000–2007</year>
+ <year>2000–2008</year>
<vendor>The Apache Software Foundation.</vendor>
<copyright-link>http://www.apache.org/licenses/</copyright-link>
@@ -185,6 +185,9 @@
text-decoration: none;
border-bottom: 1px solid #ccc;
}
+ #footer a {
+ color: navy;
+ }
#content ul.minitoc a:visited {
color: maroon;
}
diff --git a/sources/org/apache/batik/apps/svgbrowser/DOMViewerController.java b/sources/org/apache/batik/apps/svgbrowser/DOMViewerController.java
index 9388d3c..ca48e52 100644
--- a/sources/org/apache/batik/apps/svgbrowser/DOMViewerController.java
+++ b/sources/org/apache/batik/apps/svgbrowser/DOMViewerController.java
@@ -26,14 +26,15 @@
/**
* Provides the information needed for the DOMViewer to show and edit the
* document.
+ *
+ * @version $Id$
*/
public interface DOMViewerController {
/**
* Performs the document update.
*
- * @param runnable
- * The runnable that contains the update
+ * @param r The runnable that contains the update
*/
void performUpdate(Runnable r);
diff --git a/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java b/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java
index bb36acd..05daa8c 100644
--- a/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java
+++ b/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java
@@ -59,6 +59,7 @@
import org.apache.batik.gvt.renderer.ImageRendererFactory;
import org.apache.batik.gvt.text.Mark;
import org.apache.batik.util.HaltingThread;
+import org.apache.batik.util.Platform;
/**
* This class represents a component which can display a GVT tree.
@@ -1183,7 +1184,12 @@
public void mouseMoved(MouseEvent e) {
selectInteractor(e);
if (interactor != null) {
- interactor.mouseMoved(e);
+ // because the mouseDragged event doesn't seem to be generated on OSX when ctrl is held down
+ if (Platform.isOSX &&
+ interactor instanceof AbstractZoomInteractor)
+ mouseDragged(e);
+ else
+ interactor.mouseMoved(e);
deselectInteractor();
} else if (eventDispatcher != null) {
dispatchMouseMoved(e);
