[pkg-java] r5991 - in trunk/jajuk/debian: . patches
varun at alioth.debian.org
varun at alioth.debian.org
Thu Mar 13 07:58:52 UTC 2008
Author: varun
Date: 2008-03-13 07:58:51 +0000 (Thu, 13 Mar 2008)
New Revision: 5991
Added:
trunk/jajuk/debian/patches/swingx.diff
Modified:
trunk/jajuk/debian/changelog
trunk/jajuk/debian/patches/cobra.diff
trunk/jajuk/debian/patches/series
Log:
* Add patches/swingx.diff for changes in the new version of swingx
* Update patches/cobra.diff for changes in cobra
Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog 2008-03-11 20:56:22 UTC (rev 5990)
+++ trunk/jajuk/debian/changelog 2008-03-13 07:58:51 UTC (rev 5991)
@@ -1,3 +1,10 @@
+jajuk (1.5+svn3461-2) unstable; urgency=low
+
+ * Add patches/swingx.diff for changes in the new version of swingx
+ * Update patches/cobra.diff for changes in cobra
+
+ -- Varun Hiremath <varun at debian.org> Thu, 13 Mar 2008 13:46:28 +0530
+
jajuk (1.5+svn3461-1) unstable; urgency=low
* New upstream release
Modified: trunk/jajuk/debian/patches/cobra.diff
===================================================================
--- trunk/jajuk/debian/patches/cobra.diff 2008-03-11 20:56:22 UTC (rev 5990)
+++ trunk/jajuk/debian/patches/cobra.diff 2008-03-13 07:58:51 UTC (rev 5991)
@@ -1,7 +1,7 @@
-Index: jajuk-1.4.5+svn3233/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
+Index: jajuk-1.5+svn3461/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
===================================================================
---- jajuk-1.4.5+svn3233.orig/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2008-01-09 20:56:00.000000000 +0530
-+++ jajuk-1.4.5+svn3233/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2008-01-09 20:56:06.000000000 +0530
+--- jajuk-1.5+svn3461.orig/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2008-03-13 01:53:50.000000000 +0530
++++ jajuk-1.5+svn3461/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2008-03-13 01:54:23.000000000 +0530
@@ -37,12 +37,12 @@
import org.jajuk.util.Messages;
import org.jajuk.util.Util;
@@ -12,12 +12,30 @@
-import org.xamjwg.html.parser.InputSourceImpl;
-import org.xamjwg.html.test.SimpleHtmlParserContext;
-import org.xamjwg.html.test.SimpleHtmlRendererContext;
-+import org.lobobrowser.html.HtmlParserContext;
++import org.lobobrowser.html.UserAgentContext;
+import org.lobobrowser.html.gui.HtmlPanel;
+import org.lobobrowser.html.parser.DocumentBuilderImpl;
+import org.lobobrowser.html.parser.InputSourceImpl;
-+import org.lobobrowser.html.test.SimpleHtmlParserContext;
++import org.lobobrowser.html.test.SimpleUserAgentContext;
+import org.lobobrowser.html.test.SimpleHtmlRendererContext;
/**
* Type description
+@@ -53,7 +53,7 @@
+
+ private SimpleHtmlRendererContext rcontext;
+
+- private HtmlParserContext context;
++ private UserAgentContext context;
+
+ private DocumentBuilderImpl dbi;
+
+@@ -65,7 +65,7 @@
+ // Disable Cobra traces
+ Logger.getLogger("").setLevel(Level.OFF);
+ rcontext = new SimpleHtmlRendererContext(this);
+- context = new SimpleHtmlParserContext();
++ context = new SimpleUserAgentContext();
+ dbi = new DocumentBuilderImpl(context, rcontext);
+ }
+
Modified: trunk/jajuk/debian/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series 2008-03-11 20:56:22 UTC (rev 5990)
+++ trunk/jajuk/debian/patches/series 2008-03-13 07:58:51 UTC (rev 5991)
@@ -1 +1,2 @@
+swingx.diff
cobra.diff
Added: trunk/jajuk/debian/patches/swingx.diff
===================================================================
--- trunk/jajuk/debian/patches/swingx.diff (rev 0)
+++ trunk/jajuk/debian/patches/swingx.diff 2008-03-13 07:58:51 UTC (rev 5991)
@@ -0,0 +1,64 @@
+Index: jajuk-1.5+svn3461/src/main/java/org/jajuk/ui/views/PlaylistEditorView.java
+===================================================================
+--- jajuk-1.5+svn3461.orig/src/main/java/org/jajuk/ui/views/PlaylistEditorView.java 2008-01-28 03:08:22.000000000 +0530
++++ jajuk-1.5+svn3461/src/main/java/org/jajuk/ui/views/PlaylistEditorView.java 2008-03-13 01:30:25.000000000 +0530
+@@ -89,7 +89,7 @@
+ import org.jajuk.util.Util;
+ import org.jajuk.util.error.JajukException;
+ import org.jajuk.util.log.Log;
+-import org.jdesktop.swingx.decorator.AlternateRowHighlighter;
++import org.jdesktop.swingx.decorator.Highlighter;
+ import org.jdesktop.swingx.decorator.ColorHighlighter;
+
+ /**
+@@ -469,7 +469,7 @@
+
+ ColorHighlighter colorHighlighter = new ColorHighlighter(Color.ORANGE, null,
+ new PlayHighlighterPredicate(model));
+- AlternateRowHighlighter alternate = Util.getAlternateHighlighter();
++ Highlighter alternate = Util.getAlternateHighlighter();
+ jtable.setHighlighters(alternate, colorHighlighter);
+ // register events
+ ObservationManager.register(this);
+@@ -1057,4 +1057,4 @@
+ */
+ public void mouseClicked(MouseEvent e) {
+ }
+-}
+\ No newline at end of file
++}
+Index: jajuk-1.5+svn3461/src/main/java/org/jajuk/util/Util.java
+===================================================================
+--- jajuk-1.5+svn3461.orig/src/main/java/org/jajuk/util/Util.java 2008-02-04 02:22:22.000000000 +0530
++++ jajuk-1.5+svn3461/src/main/java/org/jajuk/util/Util.java 2008-03-13 01:32:01.000000000 +0530
+@@ -108,7 +108,8 @@
+ import org.jajuk.util.filters.DirectoryFilter;
+ import org.jajuk.util.filters.KnownTypeFilter;
+ import org.jajuk.util.log.Log;
+-import org.jdesktop.swingx.decorator.AlternateRowHighlighter;
++import org.jdesktop.swingx.decorator.Highlighter;
++import org.jdesktop.swingx.decorator.HighlighterFactory;
+ import org.jvnet.substance.SubstanceLookAndFeel;
+ import org.jvnet.substance.color.ColorScheme;
+ import org.jvnet.substance.theme.SubstanceTheme;
+@@ -2327,17 +2328,17 @@
+ /**
+ * @return a theme-dependent alternate row highlighter used in tables or trees
+ */
+- public static AlternateRowHighlighter getAlternateHighlighter() {
++ public static Highlighter getAlternateHighlighter() {
+ SubstanceTheme theme = SubstanceLookAndFeel.getTheme();
+ ColorScheme scheme = theme.getColorScheme();
+ Color color1 = null;
+- Color color2 = null;
++ Color color2 = Color.ORANGE;
+ if (theme.getKind().equals(SubstanceTheme.ThemeKind.DARK)) {
+ color1 = scheme.getDarkColor();
+ } else {
+ color1 = new Color(230, 235, 240);
+ }
+- return new AlternateRowHighlighter(color1, null, null);
++ return HighlighterFactory.createAlternateStriping(color1, color2);
+ }
+
+ /**
More information about the pkg-java-commits
mailing list