Changeset 96

Timestamp:

10/02/08 10:45:01 (10 months ago)

Author:

altglass

Message:

Everything can be duplicated

Files:

• trunk/src/vlcskineditor/Item.java (modified) (1 diff)
• trunk/src/vlcskineditor/Layout.java (modified) (1 diff)
• trunk/src/vlcskineditor/Main.java (modified) (17 diffs)
• trunk/src/vlcskineditor/Resource.java (modified) (1 diff)
• trunk/src/vlcskineditor/Window.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Group.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Panel.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Playtree.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Slider.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/Bitmap.java (modified) (1 diff)

trunk/src/vlcskineditor/Item.java

@@ -129 +129 @@
-    return false;
-  }
+  /** Renames the item after the copy process **/
+  public void renameForCopy(String p) {    
+    p = p.replaceAll("%oldid%", id);     
+    String newid_base = p;     
+    String newid = newid_base;
+    int i = 1;
+    while(s.idExists(newid)) {
+      i++;
+      newid = newid_base+"_"+String.valueOf(i);
+    }
+    id = newid;
+  }
-}

trunk/src/vlcskineditor/Layout.java

@@ -446 +446 @@
-    return false;
-  }
+  /** Renames the Layout and all its content after the copy process **/
+  public void renameForCopy(String p) {
+    String p_ = p;
+    p = p.replaceAll("%oldid%", id);     
+    String newid_base = p;     
+    String newid = newid_base;
+    int i = 1;
+    while(s.idExists(newid)) {
+      i++;
+      newid = newid_base+"_"+String.valueOf(i);
+    }
+    id = newid;
+    for(Item it:items) {
+        it.renameForCopy(p_);
+    }
+  }
-}

trunk/src/vlcskineditor/Main.java

@@ -28 +28 @@
-import java.io.*;
-import javax.swing.*;
-import javax.swing.filechooser.*;
-import javax.swing.tree.*;
-import javax.swing.event.*;
-import javax.swing.border.*;
-import java.util.zip.*;
-import javax.imageio.*; 
-import vlcskineditor.items.*;
-import com.ice.tar.*;
@@ -66 +64 @@
-  JPopupMenu res_add_bitmap_pu;
-  JMenuItem res_add_bitmap_pu_b, res_add_bitmap_pu_s;
-
-
+duplicate, win_
+duplicate, items_
-  JPopupMenu items_add_pu;  
-  JMenu items_add_pu_tp;
@@ -245 +243 @@
-    resources = new JInternalFrame("Resources",true,false);    
-    resources.setFrameIcon(resources_icon);
-5
+9
-    SpringLayout res_layout = new SpringLayout();
-    resources.setLayout(res_layout);     
@@ -271 +269 @@
-    res_add_font.addActionListener(this);
-    res_duplicate = new JButton("",copy_icon);
-copy of the selected item
+a copy of the selected resource
-    res_duplicate.setPreferredSize(new Dimension(24,24));
-    res_duplicate.addActionListener(this);
@@ -311 +309 @@
-    
-    resources.pack();
-20
+19
-    resources.setVisible(true);    
-    
-    windows = new JInternalFrame("Windows",true,false); 
-    windows.setFrameIcon(windows_icon);
-5
+9
-    SpringLayout win_layout = new SpringLayout();
-    windows.setLayout(win_layout);     
@@ -351 +349 @@
-    win_layout_down.setPreferredSize(new Dimension(24,12));
-    win_layout_down.addActionListener(this);
+    win_duplicate = new JButton("",copy_icon);
+    win_duplicate.setToolTipText("Create a copy of the selected window or layout");
+    win_duplicate.setMaximumSize(new Dimension(24,24));
+    win_duplicate.setPreferredSize(new Dimension(24,24));
+    win_duplicate.addActionListener(this);
-    win_edit = new JButton("",edit_icon);
-    win_edit.setToolTipText("Edit the selected resource");
@@ -363 +366 @@
-    windows.add(win_add_window);
-    windows.add(win_add_layout);
+    windows.add(win_duplicate);
-    windows.add(win_edit);
-    windows.add(win_layout_up);
@@ -373 +377 @@
-    win_layout.putConstraint(SpringLayout.NORTH, win_add_layout,5,SpringLayout.SOUTH, win_tree_sp);
-    win_layout.putConstraint(SpringLayout.NORTH, win_layout_up,5,SpringLayout.SOUTH, win_tree_sp);
-
-
-
-
-
-
+
+
-    win_layout.putConstraint(SpringLayout.NORTH, win_edit,5,SpringLayout.SOUTH, win_tree_sp);    
-    win_layout.putConstraint(SpringLayout.NORTH, win_del,5,SpringLayout.SOUTH, win_tree_sp);
@@ -385 +385 @@
-    win_layout.putConstraint(SpringLayout.WEST, win_layout_up,5,SpringLayout.EAST, win_add_layout);
-    win_layout.putConstraint(SpringLayout.WEST, win_layout_down,5,SpringLayout.EAST, win_add_layout);
-
+
+
-    win_layout.putConstraint(SpringLayout.WEST, win_del,5,SpringLayout.EAST, win_edit);    
-    win_layout.putConstraint(SpringLayout.SOUTH, windows.getContentPane(),24+5+5,SpringLayout.SOUTH, win_tree_sp);
@@ -392 +393 @@
-    
-    windows.pack();
-20
+19
-    windows.setVisible(true);   
-    
-    items = new JInternalFrame("Items",true,false);   
-    items.setFrameIcon(items_icon);
-5
+9
-    SpringLayout items_layout = new SpringLayout();
-    items.setLayout(items_layout);     
@@ -427 +428 @@
-    items_down.setPreferredSize(new Dimension(24,12));
-    items_down.addActionListener(this);
+    items_duplicate = new JButton("",copy_icon);
+    items_duplicate.setToolTipText("Create a copy of the selected resource");
+    items_duplicate.setMaximumSize(new Dimension(24,24));
+    items_duplicate.setPreferredSize(new Dimension(24,24));
+    items_duplicate.addActionListener(this);
-    items_edit = new JButton("",edit_icon);
-resource
+item
-    items_edit.setMaximumSize(new Dimension(24,24));
-    items_edit.setPreferredSize(new Dimension(24,24));
-    items_edit.addActionListener(this);
-    items_del = new JButton("",delete_icon);
-resource
+item
-    items_del.setMaximumSize(new Dimension(24,24));
-    items_del.setPreferredSize(new Dimension(24,24));
@@ -440 +446 @@
-    items.add(items_up);
-    items.add(items_down);
+    items.add(items_duplicate);
-    items.add(items_edit);
-    items.add(items_del);        
-    
-    items_layout.putConstraint(SpringLayout.WEST, items_tree_sp,5,SpringLayout.WEST, items.getContentPane());   
-
-
-
-
-
+
-    items_layout.putConstraint(SpringLayout.NORTH, items_add,5,SpringLayout.SOUTH, items_tree_sp);
-    items_layout.putConstraint(SpringLayout.NORTH, items_up,5,SpringLayout.SOUTH, items_tree_sp);
-    items_layout.putConstraint(SpringLayout.NORTH, items_down,0,SpringLayout.SOUTH, items_up);
+    items_layout.putConstraint(SpringLayout.NORTH, items_duplicate,5,SpringLayout.SOUTH, items_tree_sp);
-    items_layout.putConstraint(SpringLayout.NORTH, items_edit,5,SpringLayout.SOUTH, items_tree_sp);
-    items_layout.putConstraint(SpringLayout.NORTH, items_del,5,SpringLayout.SOUTH, items_tree_sp);
@@ -457 +461 @@
-    items_layout.putConstraint(SpringLayout.WEST, items_up,5,SpringLayout.EAST, items_add);
-    items_layout.putConstraint(SpringLayout.WEST, items_down,5,SpringLayout.EAST, items_add);
-
+
+
-    items_layout.putConstraint(SpringLayout.WEST, items_edit,5,SpringLayout.EAST, items_down);
-    items_layout.putConstraint(SpringLayout.WEST, items_del,5,SpringLayout.EAST, items_edit);    
@@ -465 +470 @@
-    
-    items.pack();
-20
+19
-    items.setVisible(true); 
-    
@@ -1027 +1032 @@
-      Resource r = s.getResource(selected_resource);
-      if(r==null) return;
+      String p = JOptionPane.showInputDialog(this, "Please enter the rename pattern for the duplicated object.\n" +
+                "%oldid% will be replaced by the old ID of the resource.", "%oldid%_copy");
-      if(r.getClass()==Bitmap.class) {
-        Bitmap b = (Bitmap)r;        
-
-
+        
+p
-        s.resources.add(b2);
-        s.updateResources();
@@ -1038 +1045 @@
-        SubBitmap sb = (SubBitmap)r;        
-        SubBitmap sb2 = new SubBitmap(sb.returnCode(),s,sb.getParentBitmap());
-
+p
-        sb.getParentBitmap().SubBitmaps.add(sb2);
-        s.updateResources();
@@ -1046 +1053 @@
-        vlcskineditor.resources.Font f = (vlcskineditor.resources.Font)r;        
-        vlcskineditor.resources.Font f2 = new vlcskineditor.resources.Font(f.returnCode(),s);
-
+p
-        s.resources.add(f2);
-        s.updateResources();
-        s.expandResource(f.id);
-      }
+    }
+    // </editor-fold>
+    // <editor-fold defaultstate="collapsed" desc="Duplicate window/layout">
+    else if(e.getSource().equals(win_duplicate)) {
+        if(selected_window==null) return;
+        String p = JOptionPane.showInputDialog(this, "Please enter the rename pattern for the duplicated object.\n" +
+                "%oldid% will be replaced by the old ID of the resource.", "%oldid%_copy");
+        if(selected_layout==null) {
+            Window w = s.getWindow(selected_window);
+            if(w==null) return;
+            Window w_ = new Window(w.returnCode(), s);
+            w_.renameForCopy(p);
+            s.windows.add(w_);
+            s.updateWindows();
+        }
+        else {
+            Window w = s.getWindow(selected_window);
+            Layout l = w.getLayout(selected_layout);
+            Layout l_ = new Layout(l.returnCode(), w, s);
+            l_.renameForCopy(p);
+            w.layouts.add(l_);
+            s.updateWindows();
+            s.expandLayout(l_.id);
+        }
+    }
+    // </editor-fold>
+    // <editor-fold defaultstate="collapsed" desc="Duplicate item">
+    else if(e.getSource().equals(items_duplicate)) {
+        if(selected_item==null) return;
+        String p = JOptionPane.showInputDialog(this, "Please enter the rename pattern for the duplicated object.\n" +
+                "%oldid% will be replaced by the old ID of the resource.", "%oldid%_copy");
+        Item i = s.getItem(selected_item);
+        if(i==null) return;        
+        if(i.getClass()==Anchor.class) {
+            Anchor a = new Anchor(i.returnCode(), s);
+            //Because IDs of Anchors are not stored in the XML and can thus not be copied via returnCode()
+            a.id = i.id;
+            a.renameForCopy(p);
+            s.getParentListOf(i.id).add(a);
+            s.updateItems();
+            s.expandItem(a.id);
+        }
+        else if(i.getClass()==vlcskineditor.items.Button.class) {
+            vlcskineditor.items.Button b = new vlcskineditor.items.Button(i.returnCode(), s);
+            b.renameForCopy(p);
+            s.getParentListOf(i.id).add(b);
+            s.updateItems();
+            s.expandItem(b.id);
+        }
+        else if(i.getClass()==vlcskineditor.items.Checkbox.class) {
+            vlcskineditor.items.Checkbox c = new vlcskineditor.items.Checkbox(i.returnCode(), s);
+            c.renameForCopy(p);
+            s.getParentListOf(i.id).add(c);
+            s.updateItems();
+            s.expandItem(c.id);
+        }
+        else if(i.getClass()==Group.class) {
+            Group g = new Group(i.returnCode(), s);
+            g.renameForCopy(p);
+            s.getParentListOf(i.id).add(g);
+            s.updateItems();
+            s.expandItem(g.id);
+        }        
+        else if(i.getClass()==vlcskineditor.items.Image.class) {
+            vlcskineditor.items.Image im = new vlcskineditor.items.Image(i.returnCode(), s);
+            im.renameForCopy(p);
+            s.getParentListOf(i.id).add(im);
+            s.updateItems();
+            s.expandItem(im.id);
+        }
+        else if(i.getClass()==vlcskineditor.items.Panel.class) {
+            vlcskineditor.items.Panel pa = new vlcskineditor.items.Panel(i.returnCode(), s);
+            pa.renameForCopy(p);
+            s.getParentListOf(i.id).add(pa);
+            s.updateItems();
+            s.expandItem(pa.id);
+        }
+        else if(i.getClass()==Playtree.class) {
+            Playtree pl = new Playtree(i.returnCode(), s);
+            pl.renameForCopy(p);
+            s.getParentListOf(i.id).add(pl);
+            s.updateItems();
+            s.expandItem(pl.id);
+        }
+        else if(i.getClass()==RadialSlider.class) {
+            RadialSlider r = new RadialSlider(i.returnCode(), s);
+            r.renameForCopy(p);
+            s.getParentListOf(i.id).add(r);
+            s.updateItems();
+            s.expandItem(r.id);
+        }
+        else if(i.getClass()==Slider.class) {
+            Slider sl = new Slider(i.returnCode(), s);
+            sl.renameForCopy(p);
+            java.util.List<Item> l = s.getParentListOf(i.id);
+            if(l!=null) {
+                l.add(sl);
+                s.updateItems();
+                s.expandItem(sl.id);
+            }
+            else {
+                //The selected slider seems to be in a playtree
+                JOptionPane.showMessageDialog(this,"A PlayTree cannot contain more than one slider!","Slider could not be duplicated",JOptionPane.INFORMATION_MESSAGE); 
+            }            
+        }
+        else if(i.getClass()==SliderBackground.class) {
+           //A slider can only have one slider background!
+           JOptionPane.showMessageDialog(this,"A slider cannot contain more than one background!","SliderBackgrounds cannot be duplicated",JOptionPane.INFORMATION_MESSAGE); 
+        }
+        else if(i.getClass()==Text.class) {
+            Text t = new Text(i.returnCode(), s);
+            t.renameForCopy(p);
+            s.getParentListOf(i.id).add(t);
+            s.updateItems();
+            s.expandItem(t.id);
+        }
+        else if(i.getClass()==Video.class) {
+            Video v = new Video(i.returnCode(), s);
+            v.renameForCopy(p);
+            s.getParentListOf(i.id).add(v);
+            s.updateItems();
+            s.expandItem(v.id);
+        }        
-    }
-    // </editor-fold>

trunk/src/vlcskineditor/Resource.java

@@ -51 +51 @@
-  }
-  /** Renames the Resource after the copy process **/
-
-
-
-
-
+
+
+
-    String newid = newid_base;
-    int i = 1;

trunk/src/vlcskineditor/Window.java

@@ -288 +288 @@
-    return node;
-  }
+  /** Renames the Layout and all its content after the copy process **/
+  public void renameForCopy(String p) { 
+    String p_ = p;
+    p = p.replaceAll("%oldid%", id);     
+    String newid_base = p;     
+    String newid = newid_base;
+    int i = 1;
+    while(s.idExists(newid)) {
+      i++;
+      newid = newid_base+"_"+String.valueOf(i);
+    }
+    id = newid;
+    for(Layout l:layouts) {
+        l.renameForCopy(p_);
+    }
+  }
-}

trunk/src/vlcskineditor/items/Group.java

@@ -317 +317 @@
-    return false;
-  }
+  @Override  
+  public void renameForCopy(String p) {    
+    String p_ = p;
+    super.renameForCopy(p);
+    for(Item i:items) {
+        i.renameForCopy(p_);
+    }
+  }
-}

trunk/src/vlcskineditor/items/Panel.java

@@ -435 +435 @@
-    return false;
-  }
+  @Override  
+  public void renameForCopy(String p) {    
+    String p_ = p;
+    super.renameForCopy(p);
+    for(Item i:items) {
+        i.renameForCopy(p_);
+    }
+  }
-}

trunk/src/vlcskineditor/items/Playtree.java

@@ -761 +761 @@
-    return (((slider!=null)?slider.uses(id_):false)||bgimage.equals(id_)||openimage.equals(id_)||closedimage.equals(id_)||itemimage.equals(id_)||font.equals(id_));
-  }
+  @Override  
+  public void renameForCopy(String p) {    
+    String p_ = p;
+    super.renameForCopy(p);
+    slider.renameForCopy(p_);
+  }
-}

trunk/src/vlcskineditor/items/Slider.java

@@ -601 +601 @@
-    return(((sbg!=null)?sbg.uses(id_):false)||up.equals(id_)||over.equals(id_)||down.equals(id_));
-  }
+  @Override  
+  public void renameForCopy(String p) {    
+    String p_ = p;
+    super.renameForCopy(p);
+    sbg.renameForCopy(p_);
+  }
-}

trunk/src/vlcskineditor/resources/Bitmap.java

@@ -382 +382 @@
-  }
-  @Override
-
-
-
+
+
+
+
-  }
-}