svn commit: r1828214 - in /xmlgraphics/fop/trunk/fop-core/src: main/java/org/apache/fop/render/intermediate/extensions/URIAction.java test/java/org/apache/fop/render/intermediate/URIActionTestCase.java

Author: ssteiner
Date: Tue Apr  3 10:20:45 2018
New Revision: 1828214

URL: http://svn.apache.org/viewvc?rev=1828214&view=rev
Log:
FOP-2781: Use unique id for links in merged IF

Added:
    xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/URIActionTestCase.java   (with props)
Modified:
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java?rev=1828214&r1=1828213&r2=1828214&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java Tue Apr  3 10:20:45 2018
@@ -45,6 +45,7 @@ public class URIAction extends AbstractA
         }
         this.uri = uri;
         this.newWindow = newWindow;
+        setID(getIDPrefix() + (uri + newWindow).hashCode());
     }
 
     /**

Added: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/URIActionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/URIActionTestCase.java?rev=1828214&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/URIActionTestCase.java (added)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/URIActionTestCase.java Tue Apr  3 10:20:45 2018
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+package org.apache.fop.render.intermediate;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.fop.render.intermediate.extensions.URIAction;
+
+public class URIActionTestCase {
+    @Test
+    public void testID() {
+        URIAction action = new URIAction("uri", true);
+        URIAction action2 = new URIAction("uri", true);
+        URIAction action3 = new URIAction("uri2", true);
+        Assert.assertEquals(action.getID(), action2.getID());
+        Assert.assertFalse(action.getID().equals(action3.getID()));
+    }
+}

Propchange: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/intermediate/URIActionTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native