rpms/piccolo2d/devel piccolo2d-pswtpath-getcenter.patch, NONE, 1.1 piccolo2d-pswtimage-dispose.patch, NONE, 1.1 piccolo2d.spec, 1.1, 1.2 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 fetch-piccolo2d.sh, 1.1, 1.2

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Oct 13 18:26:22 UTC 2009


Author: akurtakov

Update of /cvs/pkgs/rpms/piccolo2d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26614/devel

Modified Files:
	piccolo2d.spec .cvsignore sources fetch-piccolo2d.sh 
Added Files:
	piccolo2d-pswtpath-getcenter.patch 
	piccolo2d-pswtimage-dispose.patch 
Log Message:
- New snapshot.
- Add patches needed by pydev.

piccolo2d-pswtpath-getcenter.patch:
 PSWTPath.java |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE piccolo2d-pswtpath-getcenter.patch ---
--- swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java.orig	2009-10-12 21:54:31.056119535 +0300
+++ swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java	2009-10-12 21:55:49.319128179 +0300
@@ -435,4 +435,13 @@ public class PSWTPath extends PNode {
         }
         setShape(path);
     }
+
+    /**                                                                                                                                       
+     * @author Fabio Zadrozny                                                                                                                 
+     * @return The center of this object (based on its bounds).                                                                               
+     */                                                                                                                                       
+    public Point2D getCenter() {                                                                                                              
+        PBounds bounds2 = getBoundsReference();                                                                                                        
+        return new Point2D.Double(bounds2.x+(bounds2.width/2.0), bounds2.y+(bounds2.height/2.0));                                             
+    }   
 }
\ No newline at end of file

piccolo2d-pswtimage-dispose.patch:
 PSWTImage.java |   34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

--- NEW FILE piccolo2d-pswtimage-dispose.patch ---
--- swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTImage.java.orig	2009-10-12 22:06:51.299870252 +0300
+++ swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTImage.java	2009-10-12 22:09:23.646122459 +0300
@@ -58,27 +58,39 @@ public class PSWTImage extends PNode {
 
     private transient Image image;
 
-    public PSWTImage(final PSWTCanvas canvas) {
+    public PSWTImage(PSWTCanvas canvas) {
+        this(canvas, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, final boolean disposeImage) {
         super();
-
+        
         this.canvas = canvas;
         canvas.addDisposeListener(new DisposeListener() {
-            public void widgetDisposed(final DisposeEvent de) {
-                if (image != null) {
+            public void widgetDisposed(DisposeEvent de) {
+                if (image != null && disposeImage) {
                     image.dispose();
-                }
+                }    
             }
         });
     }
-
-    public PSWTImage(final PSWTCanvas canvas, final Image newImage) {
-        this(canvas);
+    
+    public PSWTImage(PSWTCanvas canvas, Image newImage) {
+        this(canvas, newImage, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, Image newImage, boolean disposeImage) {
+        this(canvas, disposeImage);
         setImage(newImage);
     }
 
-    public PSWTImage(final PSWTCanvas canvas, final String fileName) {
-        this(canvas);
-        setImage(fileName);
+    public PSWTImage(PSWTCanvas canvas, String fileName) {
+        this(canvas, fileName, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, String fileName, boolean disposeImage) {
+        this(canvas, disposeImage);
+        setImage(fileName);    
     }
 
     /**


Index: piccolo2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/piccolo2d.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- piccolo2d.spec	13 Oct 2009 18:00:24 -0000	1.1
+++ piccolo2d.spec	13 Oct 2009 18:26:22 -0000	1.2
@@ -1,8 +1,8 @@
-%global svnrev 691
+%global svnrev 702
 
 Name:           piccolo2d
 Version:        1.3
-Release:        0.svn%{svnrev}.2%{?dist}
+Release:        0.svn%{svnrev}.3%{?dist}
 Summary:        Structured 2D graphics toolkit
 
 Group:          Development/Libraries
@@ -12,6 +12,8 @@ URL:            http://code.google.com/p
 Source0:        piccolo2d-1.3-svn%{svnrev}.tar.bz2
 Source1:        fetch-piccolo2d.sh
 Source2:        %{name}-settings.xml
+Patch0:         piccolo2d-pswtpath-getcenter.patch
+Patch1:         piccolo2d-pswtimage-dispose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  maven-plugin-bundle
@@ -45,6 +47,8 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n piccolo2d.java
+%patch0
+%patch1
 
 mkdir -p .m2/repository/swt/swt-win32
 ln -s %{_libdir}/java/swt.jar .m2/repository/swt/swt-win32.jar
@@ -126,6 +130,10 @@ ln -s %{name}-%{version} %{buildroot}%{_
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn702.3
+- New snapshot.
+- Add patches needed by pydev.
+
 * Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn691.2
 - Add %%doc.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Oct 2009 18:00:25 -0000	1.2
+++ .cvsignore	13 Oct 2009 18:26:22 -0000	1.3
@@ -1 +1,2 @@
 piccolo2d-1.3-svn691.tar.bz2
+piccolo2d-1.3-svn702.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Oct 2009 18:00:25 -0000	1.2
+++ sources	13 Oct 2009 18:26:22 -0000	1.3
@@ -1 +1 @@
-c15874ada34a225b76846673c1256fc7  piccolo2d-1.3-svn691.tar.bz2
+4d9d862f37caad158ca0d244cce0399a  piccolo2d-1.3-svn702.tar.bz2


Index: fetch-piccolo2d.sh
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/fetch-piccolo2d.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fetch-piccolo2d.sh	13 Oct 2009 18:00:25 -0000	1.1
+++ fetch-piccolo2d.sh	13 Oct 2009 18:26:22 -0000	1.2
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-svnrev=691
+svnrev=702
 
 mkdir temp
 cd temp




More information about the fedora-extras-commits mailing list