[pkg-java] r2486 - in trunk/rssowl/debian: . patches
Gerardo Curiel
gerardo-guest at costa.debian.org
Sun Sep 24 19:19:05 UTC 2006
Author: gerardo-guest
Date: 2006-09-24 19:19:04 +0000 (Sun, 24 Sep 2006)
New Revision: 2486
Removed:
trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch
trunk/rssowl/debian/patches/05_swt31.patch
Modified:
trunk/rssowl/debian/control
trunk/rssowl/debian/rssowl.sh
Log:
Some patches are not needed anymore
Modified: trunk/rssowl/debian/control
===================================================================
--- trunk/rssowl/debian/control 2006-09-24 18:40:53 UTC (rev 2485)
+++ trunk/rssowl/debian/control 2006-09-24 19:19:04 UTC (rev 2486)
@@ -3,8 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Gerardo Curiel <gcuriel at debianvenezuela.org>
-Build-Depends: cdbs, debhelper (>= 5.0.34), ant, java-gcj-compat-dev, libitext-java, eclipse-platform, libcommons-logging-java, libjdom1-java, libcommons-httpclient-java, libcommons-codec-java
-Standards-Version: 3.7.0
+Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.65), ant, libitext-java, libcommons-logging-java, libjdom1-java, libcommons-httpclient-java, libcommons-codec-java
+Build-Depends: cdbs, debhelper (>= 4.1.0), eclipse-platform
+Standards-Version: 3.7.2
Package: rssowl
Architecture: all
Deleted: trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch
===================================================================
--- trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch 2006-09-24 18:40:53 UTC (rev 2485)
+++ trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch 2006-09-24 19:19:04 UTC (rev 2486)
@@ -1,169 +0,0 @@
---- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java.orig 2006-04-23 05:30:41.000000000 -0700
-+++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java 2006-05-06 09:42:26.000000000 -0700
-@@ -26,7 +26,6 @@
-
- import net.sourceforge.rssowl.controller.NewsTable;
-
--import org.eclipse.swt.SWT;
- import org.eclipse.swt.events.SelectionAdapter;
- import org.eclipse.swt.events.SelectionEvent;
- import org.eclipse.swt.widgets.Table;
-@@ -42,7 +41,7 @@
- * header is clicked and update it.
- *
- * @author <a href="mailto:masterludo at gmx.net">Ludovic Kim-Xuan Galibert </a>
-- * @version 1.2.1
-+ * @version 1.1.3
- */
- public class SortingSelectionAdapter extends SelectionAdapter {
-
-@@ -101,59 +100,67 @@
- }
-
- /**
-- * Sort the News using a Sorter that is identified by the given field value.
-+ * Handle the sorting corresponding to the header clicked
- *
-- * @param field The identifier of the Sorter to use.
-- * @return boolean TRUE if the sort was ascending, FALSE if descending.
-+ * @param se the SelectionEvent
- */
-- public boolean sort(String field) {
-+ public void widgetSelected(SelectionEvent se) {
-+ widgetSelected((TableColumn) se.getSource());
-+ }
-+
-+ /**
-+ * Handle the sorting corresponding to the header clicked
-+ *
-+ * @param tc The selected TableColumn
-+ */
-+ public void widgetSelected(TableColumn tc) {
- Comparator sorter = null;
- boolean ascending = true;
-
- /** Sort by news title */
-- if ("TABLE_HEADER_NEWSTITLE".equals(field)) {
-+ if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) {
- ascending = this.titleAscending;
- this.titleAscending = !this.titleAscending;
- sorter = new TitleSorter();
- }
-
- /** Sort by publish date */
-- else if ("TABLE_HEADER_PUBDATE".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) {
- ascending = this.pudDateAscending;
- this.pudDateAscending = !this.pudDateAscending;
- sorter = new PubDateSorter(newsItems);
- }
-
- /** Sort by author */
-- else if ("TABLE_HEADER_AUTHOR".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) {
- ascending = this.authorAscending;
- this.authorAscending = !this.authorAscending;
- sorter = new AuthorSorter(newsItems);
- }
-
- /** Sort by category */
-- else if ("TABLE_HEADER_CATEGORY".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) {
- ascending = this.categoryAscending;
- this.categoryAscending = !this.categoryAscending;
- sorter = new CategorySorter(newsItems);
- }
-
- /** Sort by publisher */
-- else if ("TABLE_HEADER_PUBLISHER".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) {
- ascending = this.publisherAscending;
- this.publisherAscending = !this.publisherAscending;
- sorter = new PublisherSorter(newsItems);
- }
-
- /** Sort by news feed */
-- else if ("TABLE_HEADER_FEED".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_FEED")) {
- ascending = this.newsfeedAscending;
- this.newsfeedAscending = !this.newsfeedAscending;
- sorter = new NewsFeedSorter(newsItems);
- }
-
- /** Sort by news status */
-- else if ("TABLE_HEADER_STATUS".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_STATUS")) {
- ascending = this.statusAscending;
- this.statusAscending = !this.statusAscending;
- sorter = new StatusSorter(newsItems);
-@@ -169,28 +176,6 @@
- if (!ascending)
- Collections.reverse(newsItemOrder);
-
-- return ascending;
-- }
--
-- /**
-- * Handle the sorting corresponding to the header clicked
-- *
-- * @param se the SelectionEvent
-- */
-- public void widgetSelected(SelectionEvent se) {
-- widgetSelected((TableColumn) se.getSource());
-- }
--
-- /**
-- * Handle the sorting corresponding to the header clicked
-- *
-- * @param tc The selected TableColumn
-- */
-- public void widgetSelected(TableColumn tc) {
--
-- /** Sort based on the given TableColumn */
-- boolean ascending = sort((String) tc.getData());
--
- /** Remember the width values of the columns */
- int columnCount = table.getColumnCount();
- int columnWidth[] = new int[columnCount];
-@@ -202,41 +187,6 @@
- if (table.getSelectionCount() > 0)
- selectedNews = table.getSelection()[0].getText(1);
-
-- /** Show a Sort Indicator inside the selected TableColumn */
-- if (!tc.getData().equals("TABLE_HEADER_STATUS")) {
-- table.setSortColumn(tc);
--
-- /** Reset Sort Direction */
-- if (table.getSortDirection() != SWT.NONE)
-- table.setSortDirection(SWT.NONE);
--
-- /** Apply the new direction */
-- table.setSortDirection(ascending ? SWT.DOWN : SWT.UP);
--
-- /**
-- * The Indicator requires some space, so pack the TableColumn. In order to
-- * avoid flashing, first set the Table to redraw = false before packing.
-- */
-- table.setRedraw(false);
-- tc.pack();
-- table.setRedraw(true);
--
-- /** Restore Focus if necessary */
-- if (!table.isFocusControl())
-- table.setFocus();
--
-- /** Grant the sorted Column its preferred Width */
-- int sortColumnIndex = table.indexOf(tc);
-- if (columnWidth[sortColumnIndex] < tc.getWidth())
-- columnWidth[sortColumnIndex] = tc.getWidth();
-- }
--
-- /** Do not show the Indicator in the first, narrow Column */
-- else if (table.getSortColumn() != null) {
-- table.setSortDirection(SWT.NONE);
-- table.setSortColumn(null);
-- }
--
- /** Remove All tableitems */
- table.removeAll();
-
Deleted: trunk/rssowl/debian/patches/05_swt31.patch
===================================================================
--- trunk/rssowl/debian/patches/05_swt31.patch 2006-09-24 18:40:53 UTC (rev 2485)
+++ trunk/rssowl/debian/patches/05_swt31.patch 2006-09-24 19:19:04 UTC (rev 2486)
@@ -1,135 +0,0 @@
---- src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java~ 2006-01-04 06:01:14.000000000 -0800
-+++ src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java 2005-07-15 16:44:50.000000000 -0700
-@@ -54,7 +54,6 @@
- import org.eclipse.swt.widgets.ToolBar;
- import org.eclipse.swt.widgets.ToolItem;
-
--import java.util.ArrayList;
- import java.util.Hashtable;
- import java.util.Vector;
-
-@@ -63,7 +62,7 @@
- * Table. A selection on a newstitle will open it inside the Newstext panel.
- *
- * @author <a href="mailto:bpasero at rssowl.org">Benjamin Pasero </a>
-- * @version 1.2.1
-+ * @version 1.1.3
- */
- public class NewsfeedPanel {
- private int[] columnWidths;
-@@ -150,15 +149,15 @@
- MenuItem generateRTF = new MenuItem(labelMenu, SWT.NONE);
- generateRTF.setText(GUI.i18n.getTranslation("MENU_GENERATE_RTF_SELECTION") + "...");
- generateRTF.setEnabled(false);
-- }
-
-- /** Not enabled */
-- MenuItem generateHTML = new MenuItem(labelMenu, SWT.NONE);
-- generateHTML.setText(GUI.i18n.getTranslation("MENU_GENERATE_HTML_SELECTION") + "...");
-- generateHTML.setEnabled(false);
-+ /** Not enabled */
-+ MenuItem generateHTML = new MenuItem(labelMenu, SWT.NONE);
-+ generateHTML.setText(GUI.i18n.getTranslation("MENU_GENERATE_HTML_SELECTION") + "...");
-+ generateHTML.setEnabled(false);
-
-- /** Separator */
-- new MenuItem(labelMenu, SWT.SEPARATOR);
-+ /** Separator */
-+ new MenuItem(labelMenu, SWT.SEPARATOR);
-+ }
-
- /** Not enabled */
- MenuItem markUnreadItem = new MenuItem(labelMenu, SWT.NONE);
-@@ -262,15 +261,9 @@
-
- /** Container for the left header */
- Composite infoViewFormHeaderLeft = new Composite(infoViewForm, SWT.NONE);
-- infoViewFormHeaderLeft.setLayout(LayoutShop.createGridLayout(2, 5, 0, 5, 6, false));
-+ infoViewFormHeaderLeft.setLayout(LayoutShop.createGridLayout(1, 5, 0));
- infoViewFormHeaderLeft.setBackground(GUI.display.getSystemColor(SWT.COLOR_WHITE));
-
-- /** Info Icon */
-- Label infoIcon = new Label(infoViewFormHeaderLeft, SWT.NONE);
-- infoIcon.setImage(PaintShop.iconInfo);
-- infoIcon.setBackground(GUI.display.getSystemColor(SWT.COLOR_WHITE));
-- infoIcon.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, true));
--
- /** Info Label */
- Label infoLabel = new Label(infoViewFormHeaderLeft, SWT.WRAP);
- infoLabel.setFont(FontShop.textFont);
-@@ -361,9 +354,17 @@
- /** Create the Table Columns */
- NewsTable.fillTableColumns(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
-
-+ /** Fill table with news - Use the existing column widhts */
-+ if (columnWidths != null && columnWidths.length == newsItemInfos.size())
-+ NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch, columnWidths);
-+
-+ /** Fill table with news - Pack the table columns */
-+ else
-+ NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
-+
- /** Auto-Sort table if the settings tell so */
- if (GlobalSettings.autoSortNews) {
-- ArrayList sortOrder = GlobalSettings.sortOrder;
-+ java.util.ArrayList sortOrder = GlobalSettings.sortOrder;
- TableData tableData = (TableData) newsTable.getData();
-
- /** Go through sortOrder from beginning to end */
-@@ -372,35 +373,12 @@
-
- /** Sort Column if sortOrderItem is available */
- if (tableData.hasColumnSorter(sortOrderItem)) {
--
-- /** Sort based on the given TableColumn */
-- boolean ascending = tableData.getColumnSorter(sortOrderItem).sort(sortOrderItem);
--
-- /** Show a Sort Indicator inside the selected TableColumn */
-- if (!"TABLE_HEADER_STATUS".equals(sortOrderItem)) {
-- newsTable.setSortColumn(tableData.getColumn(sortOrderItem));
-- newsTable.setSortDirection(ascending ? SWT.DOWN : SWT.UP);
-- }
--
-- /** Do not show the Indicator in the first, narrow Column */
-- else if (newsTable.getSortColumn() != null) {
-- newsTable.setSortDirection(SWT.NONE);
-- newsTable.setSortColumn(null);
-- }
--
-+ tableData.getColumnSorter(sortOrderItem).widgetSelected(tableData.getColumn(sortOrderItem));
- break;
- }
- }
- }
-
-- /** Fill table with news - Use the existing column widhts */
-- if (columnWidths != null && columnWidths.length == newsItemInfos.size())
-- NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch, columnWidths);
--
-- /** Fill table with news - Pack the table columns */
-- else
-- NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
--
- /** Restore last selected news if available */
- if (selectedNews != null) {
- for (int a = 0; a < newsTable.getItemCount(); a++)
-@@ -411,7 +389,7 @@
- }
- }
-
-- /** No news are there to display */
-+ /** No news are there to GUI.display */
- else {
-
- /** Save some data in TabItem */
---- src/java/net/sourceforge/rssowl/controller/NewsTable.java~ 2005-11-06 08:06:57.000000000 -0800
-+++ src/java/net/sourceforge/rssowl/controller/NewsTable.java 2006-01-04 06:08:15.000000000 -0800
-@@ -266,7 +266,7 @@
- /** Status Column is not resizable and has a ToolTip */
- if (isStatus) {
- column.setResizable(false);
-- column.setToolTipText(GUI.i18n.getTranslation(columnOrder[a]));
-+ // column.setToolTipText(GUI.i18n.getTranslation(columnOrder[a]));
- }
-
- /** Apply sorting selection adapter */
Modified: trunk/rssowl/debian/rssowl.sh
===================================================================
--- trunk/rssowl/debian/rssowl.sh 2006-09-24 18:40:53 UTC (rev 2485)
+++ trunk/rssowl/debian/rssowl.sh 2006-09-24 19:19:04 UTC (rev 2486)
@@ -8,4 +8,4 @@
export XPCOM_DIR="/usr/lib/xulrunner"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$XPCOM_DIR
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/rssowl/rssowl.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.1.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom1.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib/ -cp /usr/share/rssowl/rssowl.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/lib/java/swt3.1-gtk.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom1.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
More information about the pkg-java-commits
mailing list