[Gzz-commits] gzz/gzz/modules/pp PPActions.java PPActionsImpl...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/12/04 16:20:50

Modified files:
        gzz/modules/pp : PPActions.java PPActionsImpl.java PPView2.java 
        gzz/modules/pp/vob: VobCSGenerator.java 

Log message:
        Added delete paper -button. Have fun while debugging I'm going home 
now..

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPActions.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPActionsImpl.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/VobCSGenerator.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/PPActions.java
diff -u gzz/gzz/modules/pp/PPActions.java:1.2 
gzz/gzz/modules/pp/PPActions.java:1.3
--- gzz/gzz/modules/pp/PPActions.java:1.2       Thu Jun  6 15:33:27 2002
+++ gzz/gzz/modules/pp/PPActions.java   Wed Dec  4 16:20:50 2002
@@ -42,6 +42,9 @@
     String newPaper()
                    throws RemoteException;
 
+    void deletePaper(String paperId)
+       throws RemoteException;
+
     /** Create a new note and optionally place some text into it.
      * @param text (Optional, may be null) The text to be placed
      *                 in the new note. This parameter is given so that
Index: gzz/gzz/modules/pp/PPActionsImpl.java
diff -u gzz/gzz/modules/pp/PPActionsImpl.java:1.8 
gzz/gzz/modules/pp/PPActionsImpl.java:1.9
--- gzz/gzz/modules/pp/PPActionsImpl.java:1.8   Tue Nov  5 04:52:14 2002
+++ gzz/gzz/modules/pp/PPActionsImpl.java       Wed Dec  4 16:20:50 2002
@@ -63,6 +63,14 @@
        return n.getId();
     }}
 
+
+    public void deletePaper(String paperId) throws RemoteException 
+    { synchronized(space) {
+       space.delete(space.getCell(paperId));
+    }}
+
+
+
     public String newNote(String paperId, int x, int y, String text)
                    throws RemoteException { synchronized(space) {
        Cell c = space.getCell(paperId);
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.21 
gzz/gzz/modules/pp/PPView2.java:1.22
--- gzz/gzz/modules/pp/PPView2.java:1.21        Fri Nov 29 13:49:01 2002
+++ gzz/gzz/modules/pp/PPView2.java     Wed Dec  4 16:20:50 2002
@@ -387,18 +387,33 @@
            }
        } else {
            // the left panel
+           // ==============
 
            // put the "New paper" -text
-           TextVob new_button = new TextVob(style, "Uusi paperi");
+           TextVob new_paper_button = new TextVob(style, "Uusi paperi");
            float scale = style.getScaleByHeight(40);
-           float width = new_button.getWidth(scale);
-           int button_frame = vs.orthoBoxCS(0, "new_button_frame", 0, 0, 0, 1, 
1,
-                                  width, new_button.getHeight(scale) + 
new_button.getDepth(scale));
-           int button_cs = vs.scaleCS(button_frame, "new_button_cs",
-                     new_button.getHeight(scale) + new_button.getDepth(scale),
-                     new_button.getHeight(scale) + new_button.getDepth(scale));
-           vs.activate(button_frame);
-           vs.map.put(new_button, button_cs);
+           float width = new_paper_button.getWidth(scale);
+           int new_paper_button_frame = vs.orthoBoxCS(0, 
"new_paper_button_frame", 0, 0, 0, 1, 1,
+                                  width, new_paper_button.getHeight(scale) + 
new_paper_button.getDepth(scale));
+           int new_paper_button_cs = vs.scaleCS(new_paper_button_frame, 
"new_paper_button_cs",
+                     new_paper_button.getHeight(scale) + 
new_paper_button.getDepth(scale),
+                     new_paper_button.getHeight(scale) + 
new_paper_button.getDepth(scale));
+           vs.activate(new_paper_button_frame);
+           vs.map.put(new_paper_button, new_paper_button_cs);
+
+           // put the "Delete paper" -text
+           TextVob delete_paper_button = new TextVob(style, "Tuhoa paperi");
+           float scale2 = style.getScaleByHeight(40);
+           float width2 = delete_paper_button.getWidth(scale);
+           int delete_paper_button_frame = vs.orthoBoxCS(0, 
"delete_paper_button_frame", 0, 300, 0, 1, 1,
+                                  width2, 
delete_paper_button.getHeight(scale2) + delete_paper_button.getDepth(scale));
+           int delete_paper_button_cs = vs.scaleCS(delete_paper_button_frame, 
"delete_paper_button_cs",
+                     delete_paper_button.getHeight(scale) + 
delete_paper_button.getDepth(scale),
+                     delete_paper_button.getHeight(scale) + 
delete_paper_button.getDepth(scale));
+           vs.activate(delete_paper_button_frame);
+           vs.map.put(delete_paper_button, delete_paper_button_cs);
+
+
 
 
            // count papers
@@ -446,7 +461,7 @@
 
                int c2f = vs.coords.ortho(0, 0, 0, 0, 
                                          leftPanelZoom, leftPanelZoom);
-               vs.matcher.addSub(ctr, c2f, "C2F");
+               vs.matcher.addSub(ctr, c2f, "C2F"+ y);
 
 
                buoy_vc.setAccursed(p);
@@ -579,14 +594,17 @@
        }
 
        if(!"frame".equals(vs.matcher.getKey(cs))) {
-           if ("new_button_frame".equals(vs.matcher.getKey(cs)) ) {
-               try {
+           try {
+               if ("new_paper_button_frame".equals(vs.matcher.getKey(cs)) ) {
                    ppactions.newPaper();
+               } else if 
("delete_paper_button_frame".equals(vs.matcher.getKey(cs)) ) {
+                   pa("Deleting paper!");
+                   Cell c = ((AbstractViewContext)context).getAccursed();
+                   ppactions.deletePaper(c.getId() );
+               } else {
+                   pa("WRONG KEY! "+vs.matcher.getKey(cs));
                }
-               catch (Exception e) { pa(e.getMessage()); }
-           } else {
-               pa("WRONG KEY! "+vs.matcher.getKey(cs));
-           }
+           } catch (Exception e) { pa(e.getMessage()); }
            return null;
        }
 
@@ -602,6 +620,7 @@
        }
        if(! (key instanceof Pair)) {
            pa("Key is not pair!!! HELP "+key);
+           
            return null;
        }
        Pair p = (Pair)key;
Index: gzz/gzz/modules/pp/vob/VobCSGenerator.java
diff -u gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.3 
gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.4
--- gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.3      Mon Dec  2 20:33:19 2002
+++ gzz/gzz/modules/pp/vob/VobCSGenerator.java  Wed Dec  4 16:20:50 2002
@@ -44,6 +44,11 @@
     public VobCSGenerator(VobScene vs, int cs_into, int vob_count, int 
focus_index, float vob_width, float vob_height) {
 
        pa("Vobeja: "+ vob_count+" focus on: "+ focus_index);
+       if ( vob_count == 0) {
+           pa("DEBUG: Might be an error - but there are no vob around!");
+           return; 
+       }
+
 
        // check out..
        if (focus_index == -1) focus_index++;
@@ -53,7 +58,6 @@
        GLVobCoorder glc = (GLVobCoorder)vs.coords;
 
        // count how long the width is in given cs
-       
        float [] coords = { 0, 0,0,  1, 1,0 };
        float [] trans = new float[6];