[pkg-java] r11313 - in trunk/jajuk/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Dec 30 21:21:15 UTC 2009


Author: drazzib
Date: 2009-12-30 21:21:15 +0000 (Wed, 30 Dec 2009)
New Revision: 11313

Added:
   trunk/jajuk/debian/patches/jajuktablemodel.diff
   trunk/jajuk/debian/patches/jaudiotagger2.diff
   trunk/jajuk/debian/patches/jintellitype.diff
Removed:
   trunk/jajuk/debian/patches/swingx.diff
Modified:
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/compat
   trunk/jajuk/debian/control
   trunk/jajuk/debian/patches/cobra.diff
   trunk/jajuk/debian/patches/series
   trunk/jajuk/debian/patches/substance.diff
Log:
* New upstream bugfix release
  - Snapshot from 1.8 maintenance branch (r5628).
* debian/patches:
  - (new) jaudiotagger.diff: fix compat with Jaudiotagger 2.0
  - (new) jajuktablemodel.diff: never return null in getColumnClass
  - (new) jintellitype.diff: disable jintellitype (win32 only)
* Thighten Depends and B-D:
  - substance >= 5.2
  - libjaudiotagger >= 2.0.0
  - libswingx >= 1:1.6
* Bump debhelper version to >= 7

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2009-12-28 21:31:23 UTC (rev 11312)
+++ trunk/jajuk/debian/changelog	2009-12-30 21:21:15 UTC (rev 11313)
@@ -1,3 +1,19 @@
+jajuk (1.8.4~svn5628-1) unstable; urgency=low
+
+  * New upstream bugfix release
+    - Snapshot from 1.8 maintenance branch (r5628).
+  * debian/patches:
+    - (new) jaudiotagger.diff: fix compat with Jaudiotagger 2.0
+    - (new) jajuktablemodel.diff: never return null in getColumnClass
+    - (new) jintellitype.diff: disable jintellitype (win32 only)
+  * Thighten Depends and B-D:
+    - substance >= 5.2
+    - libjaudiotagger >= 2.0.0
+    - libswingx >= 1:1.6
+  * Bump debhelper version to >= 7
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 Dec 2009 22:08:36 +0100
+
 jajuk (1.8.2~svn5414-1) unstable; urgency=low
 
   [ Damien Raude-Morvan ]

Modified: trunk/jajuk/debian/compat
===================================================================
--- trunk/jajuk/debian/compat	2009-12-28 21:31:23 UTC (rev 11312)
+++ trunk/jajuk/debian/compat	2009-12-30 21:21:15 UTC (rev 11313)
@@ -1 +1 @@
-5
+7

Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control	2009-12-28 21:31:23 UTC (rev 11312)
+++ trunk/jajuk/debian/control	2009-12-30 21:21:15 UTC (rev 11313)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, openjdk-6-jdk, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java
+Build-Depends: cdbs, debhelper (>= 7), quilt
+Build-Depends-Indep: ant, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 2.0.0), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance (>= 5.2), libswingx-java (>= 1:1.6), libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, openjdk-6-jdk, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java
 Standards-Version: 3.8.3
 Homepage: http://jajuk.info/index.php/Main_Page
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk
@@ -12,7 +12,7 @@
 
 Package: jajuk
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java, java-wrappers
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 2.0.0), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance (>= 5.2), libswingx-java (>= 1:1.6), libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java, java-wrappers
 Description: advanced jukebox and music organizer
  Jajuk is software that organizes and plays music. Jajuk is designed
  to be intuitive, fast and provide multiple ways to perform the same

Modified: trunk/jajuk/debian/patches/cobra.diff
===================================================================
--- trunk/jajuk/debian/patches/cobra.diff	2009-12-28 21:31:23 UTC (rev 11312)
+++ trunk/jajuk/debian/patches/cobra.diff	2009-12-30 21:21:15 UTC (rev 11313)
@@ -2,7 +2,7 @@
 Origin: vendor, Debian
 Forwarded: no
 Author: Varun Hiremath <vh63 at cornell.edu>
-Last-Update: Fri, 7 Aug 2009 20:57:43 -0400
+Last-Update: 2008-08-07
 --- a/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
 +++ b/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
 @@ -42,12 +42,12 @@

Added: trunk/jajuk/debian/patches/jajuktablemodel.diff
===================================================================
--- trunk/jajuk/debian/patches/jajuktablemodel.diff	                        (rev 0)
+++ trunk/jajuk/debian/patches/jajuktablemodel.diff	2009-12-30 21:21:15 UTC (rev 11313)
@@ -0,0 +1,15 @@
+Description: Fix JajukTableModel#getColumnClass to never return null.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-30
+Forwarded: no
+--- a/src/main/java/org/jajuk/ui/helpers/JajukTableModel.java
++++ b/src/main/java/org/jajuk/ui/helpers/JajukTableModel.java
+@@ -191,7 +191,7 @@
+     if (o != null) {
+       return o.getClass();
+     } else {
+-      return null;
++      return Object.class;
+     }
+   }
+ 

Added: trunk/jajuk/debian/patches/jaudiotagger2.diff
===================================================================
--- trunk/jajuk/debian/patches/jaudiotagger2.diff	                        (rev 0)
+++ trunk/jajuk/debian/patches/jaudiotagger2.diff	2009-12-30 21:21:15 UTC (rev 11313)
@@ -0,0 +1,206 @@
+Description: Update for Jaudiotagger 2.0 API changes
+ TagFieldKey as been renamed to FieldKey
+ (r830 in upstream SVN)
+ <https://jaudiotagger.dev.java.net/issues/show_bug.cgi?id=313>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-11-14
+Forwarded: no
+--- a/src/main/java/org/jajuk/services/tags/JAudioTaggerTagImpl.java
++++ b/src/main/java/org/jajuk/services/tags/JAudioTaggerTagImpl.java
+@@ -31,7 +31,7 @@
+ import org.jaudiotagger.audio.AudioFile;
+ import org.jaudiotagger.audio.AudioFileIO;
+ import org.jaudiotagger.tag.Tag;
+-import org.jaudiotagger.tag.TagFieldKey;
++import org.jaudiotagger.tag.FieldKey;
+ import org.jaudiotagger.tag.id3.ID3v1Tag;
+ import org.jaudiotagger.tag.id3.ID3v24Tag;
+ 
+@@ -77,7 +77,7 @@
+    * @see org.jajuk.services.tags.ITagImpl#getAlbumName()
+    */
+   public String getAlbumName() throws Exception {
+-    return this.tag.getFirstAlbum();
++    return this.tag.getFirst(FieldKey.ALBUM);
+   }
+ 
+   /*
+@@ -86,7 +86,7 @@
+    * @see org.jajuk.services.tags.ITagImpl#getAuthorName()
+    */
+   public String getAuthorName() throws Exception {
+-    return this.tag.getFirstArtist();
++    return this.tag.getFirst(FieldKey.ARTIST);
+   }
+ 
+   /*
+@@ -95,7 +95,7 @@
+    * @see org.jajuk.services.tags.ITagImpl#getComment()
+    */
+   public String getComment() throws Exception {
+-    return this.tag.getFirstComment();
++    return this.tag.getFirst(FieldKey.COMMENT);
+   }
+ 
+   /*
+@@ -113,7 +113,7 @@
+    * @see org.jajuk.services.tags.ITagImpl#getOrder()
+    */
+   public long getOrder() throws Exception {
+-    String sOrder = this.tag.getFirstTrack();
++    String sOrder = this.tag.getFirst(FieldKey.TRACK);
+     if (UtilString.isVoid(sOrder)) {
+       return 0;
+     }
+@@ -138,7 +138,7 @@
+    * @see org.jajuk.services.tags.ITagImpl#getStyleName()
+    */
+   public String getStyleName() throws Exception {
+-    String result = this.tag.getFirstGenre();
++    String result = this.tag.getFirst(FieldKey.GENRE);
+     if (UtilString.isVoid(result) || "genre".equals(result)) {
+       // the item will be the default jajuk unknown string
+       return "";
+@@ -170,7 +170,7 @@
+    * @see org.jajuk.services.tags.ITagImpl#getTrackName()
+    */
+   public String getTrackName() throws Exception {
+-    return this.tag.getFirstTitle();
++    return this.tag.getFirst(FieldKey.TITLE);
+   }
+ 
+   /*
+@@ -179,7 +179,7 @@
+    * @see org.jajuk.services.tags.ITagImpl#getYear()
+    */
+   public String getYear() throws Exception {
+-    String result = this.tag.getFirstYear();
++    String result = this.tag.getFirst(FieldKey.YEAR);
+     if (UtilString.isVoid(result)) {
+       result = "0";
+     } else {
+@@ -195,7 +195,7 @@
+    */
+   public void setAlbumName(String albumName) throws Exception {
+     createTagIfNeeded();
+-    this.tag.setAlbum(albumName);
++    this.tag.setField(FieldKey.ALBUM, albumName);
+   }
+ 
+   /*
+@@ -205,7 +205,7 @@
+    */
+   public void setAuthorName(String authorName) throws Exception {
+     createTagIfNeeded();
+-    this.tag.setArtist(authorName);
++    this.tag.setField(FieldKey.ARTIST, authorName);
+   }
+ 
+   /*
+@@ -215,7 +215,7 @@
+    */
+   public void setComment(String comment) throws Exception {
+     createTagIfNeeded();
+-    this.tag.setComment(comment);
++    this.tag.setField(FieldKey.COMMENT, comment);
+   }
+ 
+   /*
+@@ -258,15 +258,14 @@
+     else if (tag instanceof ID3v1Tag) {
+       Log.info("ID3 V1.0 tag found, convertion to V2.4");
+       Tag newTag = new ID3v24Tag();
+-      newTag.setTitle(tag.getFirstTitle());
+-      newTag.setArtist(tag.getFirstArtist());
+-      newTag.setAlbum(tag.getFirstAlbum());
+-      newTag.setComment(tag.getFirstComment());
+-      newTag.setGenre(tag.getFirstGenre());
+-      newTag.setYear(tag.getFirstYear());
+-      newTag.set(newTag.createTagField(TagFieldKey.ALBUM_ARTIST, tag
+-          .getFirst(TagFieldKey.ALBUM_ARTIST)));
+-      newTag.set(newTag.createTagField(TagFieldKey.DISC_NO, tag.getFirst(TagFieldKey.DISC_NO)));
++      newTag.setField(FieldKey.TITLE, tag.getFirst(FieldKey.TITLE));
++      newTag.setField(FieldKey.ARTIST, tag.getFirst(FieldKey.ARTIST));
++      newTag.setField(FieldKey.ALBUM, tag.getFirst(FieldKey.ALBUM));
++      newTag.setField(FieldKey.COMMENT, tag.getFirst(FieldKey.COMMENT));
++      newTag.setField(FieldKey.GENRE, tag.getFirst(FieldKey.GENRE));
++      newTag.setField(FieldKey.YEAR, tag.getFirst(FieldKey.YEAR));
++      newTag.setField(FieldKey.ALBUM_ARTIST, tag.getFirst(FieldKey.ALBUM_ARTIST));
++      newTag.setField(FieldKey.DISC_NO, tag.getFirst(FieldKey.DISC_NO));
+       // Delete the id3 V1 tag
+       AudioFileIO.delete(audioFile);
+       // Add the new one
+@@ -283,7 +282,7 @@
+    */
+   public void setOrder(long order) throws Exception {
+     createTagIfNeeded();
+-    this.tag.setTrack(Long.toString(order));
++    this.tag.setField(FieldKey.TRACK, Long.toString(order));
+   }
+ 
+   /*
+@@ -294,8 +293,8 @@
+   public void setStyleName(String style) throws Exception {
+     createTagIfNeeded();
+     // Workaround for mp4 genre - Allows genres not in genre list to be written
+-    this.tag.deleteTagField(TagFieldKey.GENRE);
+-    this.tag.set(tag.createTagField(TagFieldKey.GENRE, style));
++    this.tag.deleteField(FieldKey.GENRE);
++    this.tag.setField(FieldKey.GENRE, style);
+   }
+ 
+   /*
+@@ -305,7 +304,7 @@
+    */
+   public void setTrackName(String trackName) throws Exception {
+     createTagIfNeeded();
+-    this.tag.setTitle(trackName);
++    this.tag.setField(FieldKey.TITLE, trackName);
+   }
+ 
+   /*
+@@ -315,7 +314,7 @@
+    */
+   public void setYear(String year) throws Exception {
+     createTagIfNeeded();
+-    this.tag.setYear(year);
++    this.tag.setField(FieldKey.YEAR, year);
+   }
+ 
+   /*
+@@ -324,7 +323,7 @@
+    * @see org.jajuk.services.tags.ITagImpl#getAlbumArtist()
+    */
+   public String getAlbumArtist() throws Exception {
+-    return this.tag.getFirst(TagFieldKey.ALBUM_ARTIST);
++    return this.tag.getFirst(FieldKey.ALBUM_ARTIST);
+   }
+ 
+   /*
+@@ -334,7 +333,7 @@
+    */
+   public long getDiscNumber() throws Exception {
+ 
+-    String sDiscNumber = this.tag.getFirst(TagFieldKey.DISC_NO);
++    String sDiscNumber = this.tag.getFirst(FieldKey.DISC_NO);
+     if (UtilString.isVoid(sDiscNumber)) {
+       return 01;
+     }
+@@ -351,7 +350,7 @@
+    */
+   public void setAlbumArtist(String albumArtist) throws Exception {
+     createTagIfNeeded();
+-    tag.set(tag.createTagField(TagFieldKey.ALBUM_ARTIST, albumArtist));
++    tag.setField(FieldKey.ALBUM_ARTIST, albumArtist);
+   }
+ 
+   /*
+@@ -361,7 +360,7 @@
+    */
+   public void setDiscNumber(long discnumber) throws Exception {
+     createTagIfNeeded();
+-    tag.set(tag.createTagField(TagFieldKey.DISC_NO, Long.toString(discnumber)));
++    tag.setField(FieldKey.DISC_NO, Long.toString(discnumber));
+   }
+ 
+ }

Added: trunk/jajuk/debian/patches/jintellitype.diff
===================================================================
--- trunk/jajuk/debian/patches/jintellitype.diff	                        (rev 0)
+++ trunk/jajuk/debian/patches/jintellitype.diff	2009-12-30 21:21:15 UTC (rev 11313)
@@ -0,0 +1,26 @@
+Description: Remove Microsoft Intellitype support (win32 only)
+ Remove JIntellitype imports and usage
+Origin: vendor, Debian
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-30
+--- a/src/main/java/org/jajuk/ui/actions/JajukAction.java
++++ b/src/main/java/org/jajuk/ui/actions/JajukAction.java
+@@ -19,8 +19,6 @@
+  */
+ package org.jajuk.ui.actions;
+ 
+-import com.melloware.jintellitype.JIntellitype;
+-
+ import java.awt.event.ActionEvent;
+ import java.lang.reflect.InvocationTargetException;
+ 
+@@ -50,7 +48,7 @@
+ 
+   // Instantiate a static jintellitype object
+   static {
+-    if (JIntellitype.isJIntellitypeSupported()) { 
++    if (false) { 
+       try {
+         Class.forName("org.jajuk.ui.actions.WindowsHotKeyManager")
+             .getMethod("registerJIntellitype").invoke(null, (Object[]) null);

Modified: trunk/jajuk/debian/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series	2009-12-28 21:31:23 UTC (rev 11312)
+++ trunk/jajuk/debian/patches/series	2009-12-30 21:21:15 UTC (rev 11313)
@@ -1,3 +1,5 @@
 substance.diff
-swingx.diff
 cobra.diff
+jaudiotagger2.diff
+jintellitype.diff
+jajuktablemodel.diff

Modified: trunk/jajuk/debian/patches/substance.diff
===================================================================
--- trunk/jajuk/debian/patches/substance.diff	2009-12-28 21:31:23 UTC (rev 11312)
+++ trunk/jajuk/debian/patches/substance.diff	2009-12-30 21:21:15 UTC (rev 11313)
@@ -1,12 +1,10 @@
 Description: Substance 5.2 compatibility
 Origin: vendor, Debian
 Forwarded: yes
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2009-08-07
-Index: jajuk-1.8~svn5030/src/main/java/org/jajuk/ui/substance/ButtonShaper.java
-===================================================================
---- jajuk-1.8~svn5030.orig/src/main/java/org/jajuk/ui/substance/ButtonShaper.java	2009-08-09 15:50:07.000000000 -0400
-+++ jajuk-1.8~svn5030/src/main/java/org/jajuk/ui/substance/ButtonShaper.java	2009-08-10 00:28:52.000000000 -0400
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-30
+--- a/src/main/java/org/jajuk/ui/substance/ButtonShaper.java
++++ b/src/main/java/org/jajuk/ui/substance/ButtonShaper.java
 @@ -27,7 +27,7 @@
  import java.awt.Component;
  import java.awt.Dimension;
@@ -16,9 +14,9 @@
  
  import javax.swing.AbstractButton;
  import javax.swing.border.Border;
-@@ -79,7 +79,18 @@
-    * @see org.jvnet.substance.shaper.SubstanceButtonShaper#getButtonOutline(javax.swing.AbstractButton,
-    *      java.awt.Insets, int, int)
+@@ -80,7 +80,18 @@
+    * org.jvnet.substance.shaper.SubstanceButtonShaper#getButtonOutline(javax
+    * .swing.AbstractButton, java.awt.Insets, int, int)
     */
 -  public GeneralPath getButtonOutline(AbstractButton button, Insets insets, int w, int h) {
 +  public Shape getButtonOutline(AbstractButton button, Insets insets, int w, int h) {
@@ -36,9 +34,9 @@
      return getButtonOutline(button);
    }
  
-@@ -89,7 +100,7 @@
-    * @see org.jvnet.substance.shaper.SubstanceButtonShaper#getButtonOutline(javax.swing.AbstractButton,
-    *      java.awt.Insets)
+@@ -91,7 +102,7 @@
+    * org.jvnet.substance.shaper.SubstanceButtonShaper#getButtonOutline(javax
+    * .swing.AbstractButton, java.awt.Insets)
     */
 -  public GeneralPath getButtonOutline(AbstractButton button, Insets insets) {
 +  public Shape getButtonOutline(AbstractButton button, Insets insets) {

Deleted: trunk/jajuk/debian/patches/swingx.diff
===================================================================
--- trunk/jajuk/debian/patches/swingx.diff	2009-12-28 21:31:23 UTC (rev 11312)
+++ trunk/jajuk/debian/patches/swingx.diff	2009-12-30 21:21:15 UTC (rev 11313)
@@ -1,53 +0,0 @@
-Description: colorscheme fixes for newer version of swingx
-Origin: vendor, Debian
-Forwarded: no
-Author: Varun Hiremath <vh63 at cornell.edu>
-Last-Update: Fri, 7 Aug 2009 20:57:43 -0400
-Index: jajuk-1.8~svn5030/src/main/java/org/jajuk/ui/views/QueueView.java
-===================================================================
---- jajuk-1.8~svn5030.orig/src/main/java/org/jajuk/ui/views/QueueView.java	2009-08-10 00:29:05.000000000 -0400
-+++ jajuk-1.8~svn5030/src/main/java/org/jajuk/ui/views/QueueView.java	2009-08-10 00:29:09.000000000 -0400
-@@ -187,8 +187,7 @@
-     } else {
-       queueHighlighterColor = scheme.getLineColor();
-     }
--    ColorHighlighter colorHighlighter = new ColorHighlighter(queueHighlighterColor, null,
--        new IndexHighlighterPredicate());
-+    ColorHighlighter colorHighlighter = new ColorHighlighter(new IndexHighlighterPredicate(), queueHighlighterColor, null);
-     Highlighter alternate = UtilGUI.getAlternateHighlighter();
-     editorTable.setHighlighters(alternate, colorHighlighter);
-     // register events
-@@ -597,4 +596,4 @@
-     }
-   }
- 
--}
-\ No newline at end of file
-+}
-Index: jajuk-1.8~svn5030/src/main/java/org/jajuk/ui/views/PlaylistView.java
-===================================================================
---- jajuk-1.8~svn5030.orig/src/main/java/org/jajuk/ui/views/PlaylistView.java	2009-08-10 00:29:05.000000000 -0400
-+++ jajuk-1.8~svn5030/src/main/java/org/jajuk/ui/views/PlaylistView.java	2009-08-10 00:29:09.000000000 -0400
-@@ -322,8 +322,7 @@
- 
-     initMenuItems();
- 
--    ColorHighlighter colorHighlighter = new ColorHighlighter(Color.ORANGE, null,
--        new PlayHighlighterPredicate(editorModel));
-+    ColorHighlighter colorHighlighter = new ColorHighlighter(new PlayHighlighterPredicate(editorModel), Color.ORANGE, null);
-     Highlighter alternate = UtilGUI.getAlternateHighlighter();
-     editorTable.setHighlighters(alternate, colorHighlighter);
-     // register events
-Index: jajuk-1.8~svn5030/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java
-===================================================================
---- jajuk-1.8~svn5030.orig/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java	2009-08-10 00:29:05.000000000 -0400
-+++ jajuk-1.8~svn5030/src/main/java/org/jajuk/ui/wizard/PropertiesWizard.java	2009-08-10 00:29:09.000000000 -0400
-@@ -425,7 +425,7 @@
-               // Make sure to set default date to 1970, not today to allow user
-               // to set date to today for multiple selection and to allow jajuk
-               // to detect a change
--              jdp.setDateInMillis(0l);
-+	      jdp.setDate(new Date(0l));
-             }
-             widgets[index][1] = jdp;
-           } else if (meta.getType().equals(Boolean.class)) {




More information about the pkg-java-commits mailing list