rpms/idw-gpl/devel idw-gpl-1.5.0-deprecation.patch, NONE, 1.1 idw-gpl-1.5.0-lookandfeel.patch, NONE, 1.1 idw-gpl-1.5.0-warnings.patch, NONE, 1.1 idw-gpl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jerry James (jjames)]

Author: jjames

Update of /cvs/extras/rpms/idw-gpl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21190/devel

Modified Files:
	.cvsignore sources 
Added Files:
	idw-gpl-1.5.0-deprecation.patch 
	idw-gpl-1.5.0-lookandfeel.patch idw-gpl-1.5.0-warnings.patch 
	idw-gpl.spec 
Log Message:
* Mon May  5 2008 Jerry James <loganjerry at gmail.com> - 1.5.0-5
- Add virtual provides for LAF and tabbed panels

* Thu May  1 2008 Jerry James <loganjerry at gmail.com> - 1.5.0-4
- Fix issues raised in review

* Fri Apr 18 2008 Jerry James <loganjerry at gmail.com> - 1.5.0-3
- Updates for new Java packaging guidelines

* Wed Nov 14 2007 Jerry James <loganjerry at gmail.com> - 1.5.0-2
- Fix the look-and-feel patch so it works with all JDKs
- Fix line endings in LICENSE.txt
- The source files use non-ASCII ISO-8859-1 characters

* Thu Sep  6 2007 Jerry James <loganjerry at gmail.com> - 1.5.0-1
- Initial RPM


idw-gpl-1.5.0-deprecation.patch:

--- NEW FILE idw-gpl-1.5.0-deprecation.patch ---
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/gui/shaped/panel/ShapedPanel.java idw-gpl-1.5.0/src/net/infonode/gui/shaped/panel/ShapedPanel.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/gui/shaped/panel/ShapedPanel.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/gui/shaped/panel/ShapedPanel.java	2007-09-05 21:19:57.000000000 -0600
@@ -219,7 +219,7 @@
       return false;
 
     Shape shape = getShape();
-    return shape == null ? super.inside(x, y) : shape.contains(x, y);
+    return shape == null ? super.contains(x, y) : shape.contains(x, y);
   }
 
   private boolean findShapedBorder(Border border, Insets i) {
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/Tab.java idw-gpl-1.5.0/src/net/infonode/tabbedpanel/Tab.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/Tab.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/tabbedpanel/Tab.java	2007-09-05 21:23:51.000000000 -0600
@@ -493,7 +493,7 @@
 
   private void fireDroppedEvent(TabDragEvent event) {
     if (listeners != null) {
-      TabDragEvent e = new TabDragEvent(this, this, event.getPoint());
+      TabDragEvent e = new TabDragEvent(this, event.getMouseEvent());
       Object[] l = listeners.toArray();
       for (int i = 0; i < l.length; i++)
         ((TabListener) l[i]).tabDropped(e);
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/titledtab/TitledTab.java idw-gpl-1.5.0/src/net/infonode/tabbedpanel/titledtab/TitledTab.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/titledtab/TitledTab.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/tabbedpanel/titledtab/TitledTab.java	2007-09-05 21:24:41.000000000 -0600
@@ -493,7 +493,7 @@
     }
 
     public boolean inside(int x, int y) {
-      return getComponentCount() > 0 && getComponent(0).inside(x, y);
+      return getComponentCount() > 0 && getComponent(0).contains(x, y);
     }
 
   };
@@ -505,7 +505,7 @@
 
   public boolean inside(int x, int y) {
     Point p = SwingUtilities.convertPoint(this, new Point(x, y), eventPanel);
-    return eventPanel.inside(p.x, p.y);
+    return eventPanel.contains(p.x, p.y);
   }
 
   private StatePanel normalStatePanel;

idw-gpl-1.5.0-lookandfeel.patch:

--- NEW FILE idw-gpl-1.5.0-lookandfeel.patch ---
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/gui/border/FocusBorder.java idw-gpl-1.5.0/src/net/infonode/gui/border/FocusBorder.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/gui/border/FocusBorder.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/gui/border/FocusBorder.java	2007-11-14 16:19:21.000000000 -0700
@@ -23,7 +23,6 @@
 // $Id: FocusBorder.java,v 1.14 2005/12/04 13:46:03 jesper Exp $
 package net.infonode.gui.border;
 
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
 import net.infonode.gui.UIManagerUtil;
 
 import javax.swing.*;
@@ -84,7 +83,7 @@
     if (enabled && component.hasFocus()) {
       g.setColor(UIManagerUtil.getColor("Button.focus", "TabbedPane.focus"));
 
-      if (UIManager.getLookAndFeel().getClass() == WindowsLookAndFeel.class)
+      if (UIManager.getLookAndFeel().getClass().getName().equals("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"))
         BasicGraphicsUtils.drawDashedRect(g, x, y, width, height);
       else
         g.drawRect(x, y, width - 1, height - 1);

idw-gpl-1.5.0-warnings.patch:

--- NEW FILE idw-gpl-1.5.0-warnings.patch ---
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/docking/internalutil/InternalDockingUtil.java idw-gpl-1.5.0/src/net/infonode/docking/internalutil/InternalDockingUtil.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/docking/internalutil/InternalDockingUtil.java	2007-01-31 22:27:06.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/docking/internalutil/InternalDockingUtil.java	2007-09-05 21:33:11.000000000 -0600
@@ -144,8 +144,6 @@
       WindowTabButtonProperties p = new WindowTabButtonProperties(buttonInfos[i].getProperty().get(map));
       DockingWindowAction action = p.getAction();
       Map propertyChanges = changes == null ? null : (Map) changes.get(p.getMap());
-      boolean v = p.isVisible();
-      boolean b = action != null && action.isPerformable(window);
       boolean visible = p.isVisible() && action != null && action.getAction(window).isEnabled();
 
       if ((buttons[i] == null || (propertyChanges != null && propertyChanges.containsKey(
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/docking/model/WindowItem.java idw-gpl-1.5.0/src/net/infonode/docking/model/WindowItem.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/docking/model/WindowItem.java	2007-01-31 22:27:06.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/docking/model/WindowItem.java	2007-09-05 21:35:21.000000000 -0600
@@ -294,7 +294,7 @@
     DockingWindow window = getConnectedWindow();
     writeSettings(out, context);
     boolean b = window != null && !window.isMinimized() && !window.isUndocked() && window.getRootWindow() != null;
-    out.writeBoolean(window != null && !window.isMinimized() && !window.isUndocked() && window.getRootWindow() != null);
+    out.writeBoolean(b);
   }
 
   public DockingWindow read(ObjectInputStream in, ReadContext context, ViewReader viewReader) throws IOException {
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/gui/ContentTitleBar.java idw-gpl-1.5.0/src/net/infonode/gui/ContentTitleBar.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/gui/ContentTitleBar.java	2007-01-31 22:27:06.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/gui/ContentTitleBar.java	2007-09-05 21:31:50.000000000 -0600
@@ -37,24 +37,6 @@
 public class ContentTitleBar extends HoverableShapedPanel {
   private ComponentPaintChecker repaintChecker;
 
-  private class ComponentData {
-    private JComponent component;
-    private Insets insets;
-
-    public ComponentData(JComponent component, Insets insets) {
-      this.component = component;
-      this.insets = insets;
-    }
-
-    public JComponent getComponent() {
-      return component;
-    }
-
-    public Insets getInsets() {
-      return insets;
-    }
-  }
-
   private JComponent[] leftTitleComponents;
   private JComponent[] rightTitleComponents;
   private Insets[] leftTitleComponentsInsets;
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/gui/draggable/DraggableComponent.java idw-gpl-1.5.0/src/net/infonode/gui/draggable/DraggableComponent.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/gui/draggable/DraggableComponent.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/gui/draggable/DraggableComponent.java	2007-09-05 21:29:54.000000000 -0600
@@ -38,7 +38,6 @@
 import java.util.ArrayList;
 
 public class DraggableComponent {
-  private static long MAX_EVENT_DELAY = 50;
   private JComponent component;
   private JComponent[] eventComponents;
 
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/border/OpenContentBorder.java idw-gpl-1.5.0/src/net/infonode/tabbedpanel/border/OpenContentBorder.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/border/OpenContentBorder.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/tabbedpanel/border/OpenContentBorder.java	2007-09-05 21:39:18.000000000 -0600
@@ -172,7 +172,6 @@
       for (; !it.isDone(); it.next()) {
         float lastX = coords[0];
         float lastY = coords[1];
-        int type = it.currentSegment(coords);
         int li = getLineIntersection(edge, lastX, lastY, coords[0], coords[1], orientation);
 
         if (li != Integer.MAX_VALUE) {
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/border/TabHighlightBorder.java idw-gpl-1.5.0/src/net/infonode/tabbedpanel/border/TabHighlightBorder.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/border/TabHighlightBorder.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/tabbedpanel/border/TabHighlightBorder.java	2007-09-05 21:40:57.000000000 -0600
@@ -27,9 +27,7 @@
 import net.infonode.gui.colorprovider.ColorProvider;
 import net.infonode.gui.colorprovider.ColorProviderUtil;
 import net.infonode.gui.colorprovider.UIManagerColorProvider;
-import net.infonode.tabbedpanel.Tab;
 import net.infonode.tabbedpanel.TabbedPanel;
-import net.infonode.tabbedpanel.TabbedPanelProperties;
 import net.infonode.tabbedpanel.TabbedUtils;
 import net.infonode.util.Direction;
 
@@ -45,9 +43,9 @@
  *
  * @author $Author: jesper $
  * @version $Revision: 1.19 $
- * @see Tab
+ * @see net.infonode.tabbedpanel.Tab
  * @see TabbedPanel
- * @see TabbedPanelProperties
+ * @see net.infonode.tabbedpanel.TabbedPanelProperties
  */
 public class TabHighlightBorder implements Border, Serializable {
   private static final long serialVersionUID = 1;
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/internal/TwoColoredLineBorder.java idw-gpl-1.5.0/src/net/infonode/tabbedpanel/internal/TwoColoredLineBorder.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/internal/TwoColoredLineBorder.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/tabbedpanel/internal/TwoColoredLineBorder.java	2007-09-05 21:37:48.000000000 -0600
@@ -28,7 +28,6 @@
 import net.infonode.gui.shaped.border.RoundedCornerBorder;
 import net.infonode.tabbedpanel.TabbedPanel;
 import net.infonode.tabbedpanel.TabbedUtils;
-import net.infonode.tabbedpanel.titledtab.TitledTab;
 import net.infonode.util.Direction;
 
 import java.awt.*;
@@ -40,7 +39,7 @@
  *
  * @author $Author: jesper $
  * @version $Revision: 1.7 $
- * @see TitledTab
+ * @see net.infonode.tabbedpanel.titledtab.TitledTab
  * @see TabbedPanel
  * @since ITP 1.2.0
  */
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/TabbedPanelContentPanel.java idw-gpl-1.5.0/src/net/infonode/tabbedpanel/TabbedPanelContentPanel.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/TabbedPanelContentPanel.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/tabbedpanel/TabbedPanelContentPanel.java	2007-09-05 21:36:56.000000000 -0600
@@ -64,7 +64,6 @@
       Map m = (Map) changes.get(tabbedPanel.getProperties().getContentPanelProperties().getMap());
       if (m != null) {
         if (m.keySet().contains(TabbedPanelContentPanelProperties.HOVER_LISTENER)) {
-          HoverListener oldHoverListener = shapedPanel.getHoverListener();
           shapedPanel.setHoverListener(
               (HoverListener) ((ValueChange) m.get(TabbedPanelContentPanelProperties.HOVER_LISTENER)).getNewValue());
         }
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/TabbedPanel.java idw-gpl-1.5.0/src/net/infonode/tabbedpanel/TabbedPanel.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/TabbedPanel.java	2007-01-31 22:27:54.000000000 -0700
+++ idw-gpl-1.5.0/src/net/infonode/tabbedpanel/TabbedPanel.java	2007-09-05 21:42:07.000000000 -0600
@@ -25,7 +25,6 @@
 
 import net.infonode.gui.*;
 import net.infonode.gui.draggable.*;
-import net.infonode.gui.hover.HoverEvent;
 import net.infonode.gui.hover.HoverListener;
 import net.infonode.gui.hover.panel.HoverableShapedPanel;
 import net.infonode.gui.layout.DirectionLayout;
@@ -41,7 +40,6 @@
 import net.infonode.tabbedpanel.internal.ShadowPainter;
 import net.infonode.tabbedpanel.internal.TabDropDownList;
 import net.infonode.tabbedpanel.internal.TabbedHoverUtil;
-import net.infonode.tabbedpanel.titledtab.TitledTab;
 import net.infonode.util.Direction;
 import net.infonode.util.ValueChange;
 
@@ -126,7 +124,8 @@
  * tab area components area and the content area. The listeners are set in the
  * TabbedPanelProperties, TabAreaProperties, TabAreaComponentsProperties and the
  * TabbedPanelContentPanelProperties. A hover listener is called when the mouse
- * enter or exits the area. The hover listener is called with a {@link HoverEvent}
+ * enter or exits the area. The hover listener is called with a
+ * {@link net.infonode.gui.hover.HoverEvent HoverEvent}
  * and the source for the event is always the hovered tabbed panel.
  * </p>
  *
@@ -151,7 +150,7 @@
  * @author $Author: jesper $
  * @version $Revision: 1.167 $
  * @see Tab
- * @see TitledTab
+ * @see net.infonode.tabbedpanel.titledtab.TitledTab
  * @see TabbedPanelProperties
  * @see TabListener
  * @see TabbedPanelHoverPolicy
diff -dur idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/titledtab/TitledTab.java idw-gpl-1.5.0/src/net/infonode/tabbedpanel/titledtab/TitledTab.java
--- idw-gpl-1.5.0.ORIG/src/net/infonode/tabbedpanel/titledtab/TitledTab.java	2007-09-05 21:28:57.000000000 -0600
+++ idw-gpl-1.5.0/src/net/infonode/tabbedpanel/titledtab/TitledTab.java	2007-09-05 21:43:47.000000000 -0600
@@ -532,18 +532,6 @@
     }
   };
 
-  private FocusListener focusListener = new FocusListener() {
-    public void focusGained(FocusEvent e) {
-      if (properties.getFocusable())
-        repaint();
-    }
-
-    public void focusLost(FocusEvent e) {
-      if (properties.getFocusable())
-        repaint();
-    }
-  };
-
   /**
    * Constructs a TitledTab with a text, icon, content component and title component.
    *


--- NEW FILE idw-gpl.spec ---
# Use rpmbuild --without gcj to disable native bits
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           idw-gpl
Version:        1.5.0
Release:        5%{?dist}
Summary:        A Java Swing-based docking windows framework

Group:          Development/Libraries/Java
License:        GPLv2+
URL:            http://www.infonode.net/
Source:         http://downloads.sourceforge.net/infonode/%{name}-%{version}-src.zip
# Don't assume that WindowsLookAndFeel exists (accepted upstream)
Patch0:         idw-gpl-1.5.0-lookandfeel.patch
# Update some deprecated calls (accepted upstream)
Patch1:         idw-gpl-1.5.0-deprecation.patch
# Fix most other compiler warnings, except for missing serialVersionUID
# (accepted upstream)
Patch2:         idw-gpl-1.5.0-warnings.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides:       ilf-gpl = %{version}-%{release}, itp-gpl = %{version}-%{release}

BuildRequires:  java-devel, jpackage-utils
Requires:       java, jpackage-utils
%if %{with_gcj}
BuildRequires:  java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

%description
InfoNode Docking Windows is a Java Swing-based docking windows framework.  It
also includes a highly flexible tabbed panel component and a slim Swing look
and feel.

%package javadoc
Group:          Development/Libraries/Java
Summary:        Javadoc for InfoNode Docking Windows
Requires:       idw-gpl = %{version}-%{release}, jpackage-utils

%description javadoc
Javadoc documentation for InfoNode Docking Windows.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1

# Fix line endings
sed -i 's/\r//' LICENSE.txt

%build
mkdir classes
find src -type f -name '*.java' | \
  xargs javac -d classes -g -source 1.3 -encoding ISO8859-1
for d in net/infonode/tabbedpanel/theme/internal/resource net/infonode/docking/theme/internal/resource; do
  cp -a src/$d classes/$d
done
jar cf %{name}-%{version}.jar -C classes .
mkdir docs
find src -type f -name '*.java' | xargs javadoc -d docs -version -author 

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
mv docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadir}/%{name}*
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}*

%changelog
* Mon May  5 2008 Jerry James <loganjerry at gmail.com> - 1.5.0-5
- Add virtual provides for LAF and tabbed panels

* Thu May  1 2008 Jerry James <loganjerry at gmail.com> - 1.5.0-4
- Fix issues raised in review

* Fri Apr 18 2008 Jerry James <loganjerry at gmail.com> - 1.5.0-3
- Updates for new Java packaging guidelines

* Wed Nov 14 2007 Jerry James <loganjerry at gmail.com> - 1.5.0-2
- Fix the look-and-feel patch so it works with all JDKs
- Fix line endings in LICENSE.txt
- The source files use non-ASCII ISO-8859-1 characters

* Thu Sep  6 2007 Jerry James <loganjerry at gmail.com> - 1.5.0-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/idw-gpl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 May 2008 20:53:07 -0000	1.1
+++ .cvsignore	7 May 2008 15:01:32 -0000	1.2
@@ -0,0 +1 @@
+idw-gpl-1.5.0-src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/idw-gpl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 May 2008 20:53:07 -0000	1.1
+++ sources	7 May 2008 15:01:32 -0000	1.2
@@ -0,0 +1 @@
+fd4db588127cb400482dbc1427b57359  idw-gpl-1.5.0-src.zip