Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ebourg/flamingo-svg-transcoder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.2
Choose a base ref
...
head repository: ebourg/flamingo-svg-transcoder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 6, 2016

  1. Refreshed the generated classes used by the tests

    @ebourg
    ebourg committed Jul 6, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    smoores-dev Shane Friedman
    SSH Key Fingerprint: vQMarUc1WBfc7p0Bo1s1WfCo5ndiOBwdSxlfta3Zk84
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d030900 View commit details

  2. Added the Codebase, Permissions and Application-Name attributes to th… 

    …e manifest of the GUI jar
    @ebourg
    ebourg committed Jul 6, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    smoores-dev Shane Friedman
    SSH Key Fingerprint: vQMarUc1WBfc7p0Bo1s1WfCo5ndiOBwdSxlfta3Zk84
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2809dd6 View commit details

  3. Use properties for the keystore settings

    @ebourg
    ebourg committed Jul 6, 2016
    Copy the full SHA
    c12f421 View commit details
Showing with 29 additions and 10 deletions.
  1. +3 −3 core/src/test/java/transcoded/edit_copy.java
  2. +26 −7 gui/pom.xml
6 changes: 3 additions & 3 deletions core/src/test/java/transcoded/edit_copy.java
View file
Original file line number Diff line number Diff line change
@@ -44,13 +44,13 @@ public static void paint(Graphics2D g) {
g.transform(new AffineTransform(1.001508f, 0, 0, 1.000616f, -0.05002205f, -0.06304895f));

// _0_0_0
g.setComposite(AlphaComposite.getInstance(3, 0.17045452f * origAlpha));
g.setComposite(AlphaComposite.getInstance(3, 0.08522725f * origAlpha));

// _0_0_0_0
shape = new Rectangle2D.Double(20.161836624145508, 34.03341293334961, 13, 2);
g.setPaint(BLACK);
g.fill(shape);
g.setComposite(AlphaComposite.getInstance(3, 1 * origAlpha));
g.setComposite(AlphaComposite.getInstance(3, 0.49999997f * origAlpha));

// _0_0_0_1
shape = new RoundRectangle2D.Double(1.5484408140182495, 1.5629303455352783, 30.95155906677246, 35.976688385009766, 1.131310224533081, 1.1323192119598389);
@@ -65,7 +65,7 @@ public static void paint(Graphics2D g) {
g.setPaint(new LinearGradientPaint(new Point2D.Double(26.076091766357422, 26.69667625427246), new Point2D.Double(30.811172485351562, 42.00735092163086), new float[]{0, 1}, new Color[]{WHITE, new Color(0xFFFFFF, true)}, NO_CYCLE, SRGB, new AffineTransform(0.998504f, 0, 0, 0.998246f, -6.970391f, -4.892901f)));
g.setStroke(new BasicStroke(0.99893963f, 0, 0, 4));
g.draw(shape);
g.setComposite(AlphaComposite.getInstance(3, 0.17045452f * origAlpha));
g.setComposite(AlphaComposite.getInstance(3, 0.08522725f * origAlpha));

// _0_0_0_3
shape = new Rectangle2D.Double(7.016119003295898, 10.033413887023926, 21, 2);
33 changes: 26 additions & 7 deletions gui/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -52,6 +52,18 @@

<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Codebase>*</Codebase>
<Permissions>all-permissions</Permissions>
<Application-Name>Flamingo SVG Transcoder</Application-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -102,9 +114,9 @@
<configuration>
<keystore>target/maven.keystore</keystore>
<dname>cn=SVG Transcoder</dname>
<keypass>secret</keypass>
<storepass>secret</storepass>
<alias>maven</alias>
<keypass>${keypass}</keypass>
<storepass>${keypass}</storepass>
<alias>${keyalias}</alias>
<validity>3650</validity>
</configuration>
</plugin>
@@ -126,16 +138,23 @@
<j2seVersion>1.7+</j2seVersion>
</jnlp>
<sign>
<keystore>${basedir}/src/main/config/maven.keystore</keystore>
<keypass>secret</keypass>
<storepass>secret</storepass>
<keystore>${keystore}</keystore>
<keypass>${keypass}</keypass>
<storepass>${keypass}</storepass>
<storetype>jks</storetype>
<alias>maven</alias>
<alias>${keyalias}</alias>
<tsaLocation>http://timestamp.comodoca.com/rfc3161</tsaLocation>
<verify>true</verify>
</sign>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<keystore>${basedir}/src/main/config/maven.keystore</keystore>
<keyalias>maven</keyalias>
<keypass>secret</keypass>
</properties>

</project>