Changeset 68

Timestamp:

31/10/07 19:11:31 (1 year ago)

Author:

altglass

Message:

Documentation and minor code restructuring.

Files:

• trunk/nbproject/genfiles.properties (modified) (1 diff)
• trunk/nbproject/project.properties (modified) (2 diffs)
• trunk/src/vlcskineditor/ActionEditor.java (modified) (8 diffs)
• trunk/src/vlcskineditor/ActionPanel.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Bezier.java (modified) (1 diff)
• trunk/src/vlcskineditor/BooleanExpressionEvaluator.java (modified) (1 diff)
• trunk/src/vlcskineditor/Item.java (modified) (1 diff)
• trunk/src/vlcskineditor/Items/Anchor.java (modified) (4 diffs)
• trunk/src/vlcskineditor/Items/Group.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Items/RadialSlider.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Layout.java (modified) (11 diffs)
• trunk/src/vlcskineditor/Main.java (modified) (10 diffs)
• trunk/src/vlcskineditor/NumbersOnlyDocument.java (modified) (2 diffs)
• trunk/src/vlcskineditor/PreviewWindow.java (modified) (8 diffs)
• trunk/src/vlcskineditor/ProgressWindow.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Resource.java (modified) (1 diff)
• trunk/src/vlcskineditor/Resources/Bitmap.java (modified) (8 diffs)
• trunk/src/vlcskineditor/Resources/BitmapFont.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Resources/Font.java (modified) (4 diffs)
• trunk/src/vlcskineditor/Resources/SubBitmap.java (modified) (6 diffs)
• trunk/src/vlcskineditor/package.html (added)

trunk/nbproject/genfiles.properties

@@ -6 +6 @@
-nbproject/build-impl.xml.data.CRC32=9599816b
-nbproject/build-impl.xml.script.CRC32=28555a9f
-65d7ca21
+20b9345e

trunk/nbproject/project.properties

@@ -31 +31 @@
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}
-
+-header "VLC Skin Editor"
-javadoc.author=false
-javadoc.encoding=
@@ -41 +41 @@
-javadoc.use=true
-javadoc.version=false
-
+"VLC Skin Editor API Documentation"
-main.class=vlcskineditor.Main
-manifest.file=manifest.mf

trunk/src/vlcskineditor/ActionEditor.java

@@ -29 +29 @@
-
-/**
-
+
+
+
+
- * @author Daniel Dreibrodt
- */
-public class ActionEditor extends JFrame implements ActionListener{
-  
+  //The actions in the chain, respectively the Panels representing them 
-  java.util.List<ActionPanel> aPanels = new LinkedList<ActionPanel>();  
-  
@@ -39 +43 @@
-  public ImageIcon delete_icon = createIcon("icons/delete.png");  
-  
+  //The panel that handels the scrolling through the list of actions
-  JScrollPane sPane;
+  //The panel containing the actual ActionPanels
-  JPanel actions_p = new JPanel();
-
+
+
-  JButton ok_btn = new JButton("OK");
-  
@@ -100 +107 @@
-  JMenuItem actions_windows_setLayout = new JMenuItem("Change the layout of a window");
-  
+  //The skin item to which the represented action chain belongs
-  Item parent;
-  
@@ -289 +297 @@
-    setResizable(false);    
-  }
+  /**
+   * Generates the code by calling the getActionCode() function of each ActionPanel
+   * @see ActionPanel#getActionCode()
+   * @return A string readable by VLC representing the action chain
+   */
-  public String getCode() {     
-    String code = "";
@@ -294 +307 @@
-    return code;
-  }
+  /**
+   * Replaces the current action chain by a new one
+   * @param a The action string
+   */
-  public void updateActions(String a) {
-    actions_p.removeAll();
@@ -301 +318 @@
-    actions_p.updateUI();
-  }
+  /**
+   * Adds an action to the chain
+   * @param act The action string
+   */
-  public void addAction(String act) {
-    act=act.trim();
@@ -308 +329 @@
-    actions_p.updateUI();
-  }
+  /**
+   * Shows the dialog for editing the given action
+   * @param a The action string to be edited
+   */
-  public void editAction(String a) {
-    updateActions(a);
-    setVisible(true);
-  }
+  /**
+   * Reacts to user interaction
+   */
-  public void actionPerformed(ActionEvent e) {
-    if(e.getSource().equals(add_btn)) actions_pu.show(add_btn,0,0);
@@ -332 +360 @@
-    }
-  }
+  /**
+   * Creates an ImageIcon out of a file
+   */
-  public ImageIcon createIcon(String filename) {
-      java.awt.Image img = null;

trunk/src/vlcskineditor/ActionPanel.java

@@ -28 +28 @@
-
-/**
-ctionPanel
+ visual representation of a single action providing input components for modifying/deleting the represented action
- * @author Daniel Dreibrodt
- */
@@ -175 +175 @@
-    setMaximumSize(new Dimension(445,30));
-  }
+  /** 
+   * Generates the action string from the type of the represented action and from user modifications.
+   * The string ends with a semicolon.
+   * @return A string readable by VLC representing the action that is represented by the panel
+   */
-  public String getActionCode() {
-    if(action_type.equals("static")) return action;

trunk/src/vlcskineditor/Bezier.java

@@ -27 +27 @@
-
-/**
-
+
+
+
+
- * @author Daniel Dreibrodt
- * Conversion of VLC /trunk/modules/gui/skins2/utils/bezier.cpp
- * original authors: Cyril Deguet     <asmax@via.ecp.fr>
- *                   Olivier Teuliére <ipkiss@via.ecp.fr>
- */
-public class Bezier {

trunk/src/vlcskineditor/BooleanExpressionEvaluator.java

@@ -26 +26 @@
-
-/**
-BooleanExpressionEvaluator
-
+Helper class to evaluate boolean expressions.
+. <br>
- * Original code by Cyril Deguet <asmax@via.ecp.fr>
- * @author Daniel Dreibrodt

trunk/src/vlcskineditor/Item.java

@@ -74 +74 @@
-  /** Show a dialog to modify the items's parameters */
-  public abstract void showOptions();  
+  /** Update the Item's attributes according to the user input */
+  public abstract void update();
-  /** Creates the XML code representing the item */
-  public abstract String returnCode();

trunk/src/vlcskineditor/Items/Anchor.java

@@ -52 +52 @@
-  int[] xpos,ypos;
-  
-
+
+
+
+
+
-  public Anchor(String xmlcode, Skin s_) {
-    s=s_;
@@ -66 +70 @@
-    created = true;
-  }
+  /**
+   * Creates a new Anchor from user input.
+   * @param s_ The Skin in which the Anchor is used.
+   */
-  public Anchor(Skin s_) {
-    s = s_;
@@ -85 +93 @@
-    b = new Bezier(xpos,ypos,Bezier.kCoordsBoth);
-  }
-String id_, int p_, String lt_, int x_, int y_, String pts_, int r_
-
-p_
-t_
-x_
-y_
-ts_
-r_
+
+tf.getText()
+Integer.parseInt(priority_tf.getText())
+efttop_cb.getSelectedItem().toString()
+Integer.parseInt(x_tf.getText())
+Integer.parseInt(y_tf.getText())
+oints_tf.getText()
+Integer.parseInt(range_tf.getText())
-    updateBezier();
-    s.updateItems();
@@ -211 +219 @@
-      }
-      frame.setVisible(false);
-id_tf.getText(),Integer.parseInt(priority_tf.getText()),(String)lefttop_cb.getSelectedItem(),Integer.parseInt(x_tf.getText()),Integer.parseInt(y_tf.getText()),points_tf.getText(),Integer.parseInt(range_tf.getText())
+
-    }
-    else if(e.getSource().equals(help_btn)) {

trunk/src/vlcskineditor/Items/Group.java

@@ -113 +113 @@
-    s.updateItems();        
-  }
-String id_, int x_, int y_
-
-x_
-y_
+
+tf.getText()
+Integer.parseInt(x_tf.getText())
+Integer.parseInt(y_tf.getText())
-    for(Item i:items) {
-      i.setOffset(x,y);
@@ -197 +197 @@
-      }
-      frame.setVisible(false);
-id_tf.getText(),Integer.parseInt(x_tf.getText()),Integer.parseInt(y_tf.getText())
+
-    }
-    else if(e.getSource().equals(help_btn)) {

trunk/src/vlcskineditor/Items/RadialSlider.java

@@ -29 +29 @@
-
-/**
-
-
+
+
+
- * @author Daniel Dreibrodt
- */
@@ -70 +71 @@
-    showOptions();
-  }
+  public void update() {
+    
+  }
-  public void showOptions() {
-    

trunk/src/vlcskineditor/Layout.java

@@ -60 +60 @@
-  boolean created = false;
-  
-
+
+
+
+
+
-  public Layout(String xmlcode, Skin s_) {
-    s=s_;
@@ -144 +148 @@
-    created = true;
-  }
+  /**
+   * Creates a new Layout from user input.
+   * @param s_ The Skin in which the Layout is used.
+   */
-  public Layout(Skin s_) {
-    s=s_;
@@ -151 +159 @@
-    showOptions();
-  }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    s.updateWindows();
-    s.expandLayout(id);
@@ -164 +175 @@
-    frame.setDefaultCloseOperation(frame.HIDE_ON_CLOSE);
-  }
+  /**
+   * Shows a dialog to edit this Layout's attributes.
+   */
-  public void showOptions() {
-    if(frame==null) {
@@ -267 +281 @@
-    frame.setVisible(true);
-  }
+  /**
+   * Handles the user interaction with the editing dialog.
+   */
-  public void actionPerformed(ActionEvent e) {
-    if(e.getSource().equals(ok_btn)) {
@@ -288 +305 @@
-      }
-      frame.setVisible(false);
-id_tf.getText(),Integer.parseInt(width_tf.getText()),Integer.parseInt(height_tf.getText()),Integer.parseInt(minwidth_tf.getText()),Integer.parseInt(minheight_tf.getText()),Integer.parseInt(maxwidth_tf.getText()),Integer.parseInt(maxheight_tf.getText())
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -314 +331 @@
-    }
-  }
+  /**
+   * Draws the Layout.
+   * @param g The Graphics2D context onto which the Layout will be drawn.
+   */
-  public void draw(Graphics2D g) {
-    for(Item i:items) {
@@ -319 +340 @@
-    }
-  }
+  /**
+   * Generates the XML code represented by this Layout.
+   * @return The XML code.
+   */
-  public String returnCode() {
-    String code ="<Layout";
@@ -334 +359 @@
-    return code;
-  }
+  /**
+   * Creates a TreeNode visualizing this Layout in the windows and layouts tree.
+   * @return The TreeNode to display this Layout in a JTree.
+   */
-  public DefaultMutableTreeNode getTreeNode() {
-    DefaultMutableTreeNode node = new DefaultMutableTreeNode("Layout: "+id);    
-    return node;
-  }  
+  /**
+   * Gets the Item of the given id if it is contained in the Layout.
+   * @param id_ The ID of the desired Item.
+   * @return If the Item was found the Item object is returned. Otherwise <pre>null</pre> is returned.
+   */
-  public Item getItem(String id_) {    
-    for(int x=0;x<items.size();x++) {
@@ -345 +379 @@
-    return null;
-  }
+  /**
+   * Gets the List in which the Item specified by the given ID is stored.
+   * @param id_ The ID of the desired Item.
+   * @return If the Item was found in the Layout the List containing the Item is returned. Otherwise <pre>null</pre> is returned.
+   * @see java.util.List
+   */
-  public java.util.List<Item> getParentListOf(String id_) {
-    for(int x=0;x<items.size();x++) {
@@ -358 +398 @@
-    return null;
-  }
+  /**
+   * Gets the parent Item of the Item specified by the given ID.
+   * @param id_ The ID of the Item of which one wants the parent.
+   * @return If the Item was found in the Layout its parent is returned. Otherwise <pre>null</pre> is returned.
+   */
-  public Item getParentOf(String id_) {
-    for(int x=0;x<items.size();x++) {

trunk/src/vlcskineditor/Main.java

@@ -46 +46 @@
- */
-public class Main extends javax.swing.JFrame implements ActionListener, TreeSelectionListener, WindowListener, MouseListener{
+  /**
+   * The version identification of the current build.
+   */
-  public final String VERSION = "0.6.0a";
-  String vlc_dir = "";
@@ -83 +86 @@
-  public ImageIcon down_icon = createIcon("icons/move_down.png");
-  public ImageIcon help_icon = createIcon("icons/help.png");
+  //The VLC Skin Editor icon.
-  public ImageIcon icon = createIcon("icons/icon.png");  
-  public ImageIcon open_icon = createIcon("icons/open.png");
@@ -96 +100 @@
-  JFileChooser base_fc, bitmap_adder, font_adder, vlt_saver;
-  PreviewWindow pvwin;
+  //Specifies whether changes were made without having saved the skin.  
-  public boolean saved = false;
+  //Specifies whether a file is currently being opened
-  boolean opening = false;  
+  //Specifies if a file was opened
+  boolean opened = false;
-  
-
+
+
+
+
+
-  public Main(String[] args) {
-    setTitle("New skin - VLC Skin Editor "+VERSION);
@@ -541 +553 @@
-    else showWelcomeDialog();
-  }
+  /**
+   * Shows a dialog from which the user can choose to either create a new skin, open an existing skin or quit the skin editor.
+   */
-  public void showWelcomeDialog() {
-    Object[] options= {"Create a new skin", "Open an exisiting skin","Quit"};
@@ -555 +570 @@
-    } 
-  }
+  /**
+   * Shows the "Open File" dialog.
+   */
-  public void openFile() {
-    opening = true;
@@ -562 +580 @@
-    if(returnVal == JFileChooser.APPROVE_OPTION) {      
-      openFile(base_fc.getSelectedFile());
+      opening = false;
-    }
-    else {
-showWelcomeDialog()
-}
-opening = false;
+opening = false
+  if(!opened) showWelcomeDialog();
+}
-  }
+  /**
+   * Opens the given file as a skin.
+   * @param f The skin file.
+   */
-  public void openFile(File f) {
-    if(!f.exists()) {
-      JOptionPane.showMessageDialog(this,"The file \""+f.getPath()+"\" does not exist and thus could not be opened!","Error while opening file",JOptionPane.ERROR_MESSAGE);
-
+if(!opened) 
-      return;
-    }
@@ -673 +696 @@
-    saved = true;      
-    opening = false;
+    opened = true;
-    pwin.setVisible(false);    
-  }
+  /**
+   * Shows a dialog to specify the new skin's location and creates an empty skin.
+   */
-  public void createNew() {
-      base_fc.setFileFilter(new CustomFileFilter(base_fc,"xml","*.xml (VLC XML-Skin Files)",false,vlc_dir));      
-      int returnVal=base_fc.showSaveDialog(this);        
-      if(returnVal != JFileChooser.APPROVE_OPTION) {
-showWelcomeDialog();   
+if(!opened) showWelcomeDialog();
-      }
-      else {
@@ -690 +717 @@
-        selected_window = null;
-        selected_item = null;
-
+
+
-      }
-  }
-
+
+
+
-  public void actionPerformed(ActionEvent e) {
-    // <editor-fold defaultstate="collapsed" desc="New File"> 
@@ -1207 +1237 @@
-  }
-  
-
+
+
+
-  public void valueChanged(TreeSelectionEvent e) {    
-    if(opening) return;
@@ -1306 +1338 @@
-  /**
-   * Creates an ImageIcon of an image included in the JAR
- 
-        
+
+
-   */
-  public ImageIcon createIcon(String filename) {

trunk/src/vlcskineditor/NumbersOnlyDocument.java

@@ -28 +28 @@
- * NumbersOnlyDocument
- * allows only numbers to be entered into a component
+ * @see javax.swing.text.Document
- * @author Daniel Dreibrodt
- */
@@ -38 +39 @@
-    super();
-  }
-
+
+
+
-  public NumbersOnlyDocument(boolean negative) {
-    super();
-    allow_negative = negative;
-  }  
-[pre]str[/pre]
+<pre>str</pre>
-  public void insertString(int offset, String str, AttributeSet a) throws BadLocationException {
-    if(str.matches("[-]") && allow_negative) {

trunk/src/vlcskineditor/PreviewWindow.java

@@ -30 +30 @@
-
-/**
-
-
+
- * @author Daniel Dreibrodt
- */
-public class PreviewWindow extends JPanel implements MouseListener, MouseMotionListener {
-  
+  /**
+   * The JFrame in which a Layout of a Skin will be shown.
+   */
-  public JInternalFrame frame;
-  Layout l;
@@ -45 +47 @@
-  JMenuItem up, down, right, left;
-  
-
+
+
+
-  public PreviewWindow() {   
-    frame = new JInternalFrame("No Layout selected");
@@ -55 +59 @@
-    addMouseMotionListener(this);    
-  }
+  /**
+   * Is invoked when the user deselects a layout.
+   * All references to the old layout are cleared and the window is hidden.
+   * Additionally the FrameUpdater is stopped.
+   */
-  public void clearLayout() {
-    l=null;
@@ -62 +71 @@
-    fu=null;
-  }
+  /**
+   * Invoked when the user selects a Layout.
+   * Shows the preview window and there draws the selected layout.
+   * @param w_ The Window containing the Layout.
+   * @param l_ The Layout that should be displayed.
+   */
-  public void setLayout(Window w_, Layout l_) {
-    if(l_==null) {
@@ -81 +96 @@
-    }    
-  }
+  /**
+   * Invoked when a user selects an Item. This tells the PreviewWindow which item should be moved when the user interacts with the window.
+   * @param i The Item selected by the user.
+   */
-  public void selectItem(Item i) {    
-    if(selected_item!=null) selected_item.setSelected(false);
@@ -87 +106 @@
-    selected_item.setSelected(true);
-  }
+  /**
+   * Paints the selected layout into the window.
+   * @param g The Graphics context into which is drawn.
+   */
-  public void paint(Graphics g) {  
-    if(l==null) return;   
@@ -153 +176 @@
-    dragstartitemy=selected_item.y;
-  }
+  /**
+   * Moves the currently selected item about the given distance.
+   * @param x Movement along the X-Axis.
+   * @param y Movement along the Y-Axis.
+   */
-  public void moveItem(int x, int y) {    
-    try {
@@ -163 +191 @@
-    }
-  }
+  /**
+   * Creates an ImageIcon from a file.
+   */
-  public ImageIcon createIcon(String filename) {
-    java.awt.Image img = null;    

trunk/src/vlcskineditor/ProgressWindow.java

@@ -27 +27 @@
-
-/**
-ProgressWindow
+A window displaying a progress bar running back and forth.
- * @author Daniel Dreibrodt
- */
-public class ProgressWindow extends JDialog{
-  
-  
+
-  String title = "...";
-  JProgressBar pbar;
@@ -48 +48 @@
-    pbar.setIndeterminate(true);
-  }  
+  /** Sets the text displayed on the progress bar */
-  public void setText(String s) {
-    pbar.setString(s);

trunk/src/vlcskineditor/Resource.java

@@ -40 +40 @@
-  /** Show a dialog to modify the resource's parameters */
-  public abstract void showOptions();  
-
+
+
+
-  public abstract String returnCode();
-  /** Creates a DefaultMutableTreeNode to be displayed in the resources tree */

trunk/src/vlcskineditor/Resources/Bitmap.java

@@ -40 +40 @@
-public class Bitmap extends Resource implements ActionListener{
-  
-  /** Creates a new instance of Bitmap */  
-  public String file;
-  public final String ALPHACOLOR_DEFAULT = "#000000";
@@ -48 +47 @@
-  public final int FPS_DEFAULT = 0;
-  public int fps = FPS_DEFAULT;
+  //The list containing the bitmap's SubBitmaps  
-  public java.util.List<SubBitmap> SubBitmaps = new LinkedList<SubBitmap>();
+  //The image represented by the Bitmap item
-  public BufferedImage image;
-  
-
-
-
-
+private 
+private 
+private 
+private 
-  
-
+
+
+
+
+
+
-  public Bitmap(String xmlcode, Skin s_) {    
-    type = "Bitmap";
@@ -80 +86 @@
-      }
-    }    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  public Bitmap(String id_, String file_, String alphacolor_, int nbframes_, int fps_, Skin s_) {
-    type="Bitmap";
@@ -90 +106 @@
-    nbframes=nbframes_;
-    fps=fps_;        
-
-
+
+
+
+
+
+
+
+
-  public Bitmap(Skin s_, File f_) {
-    s = s_;
@@ -102 +124 @@
-    id = id_t;
-    s.updateResources();    
-
+Image
-  } 
-
+
+
+
+
-    try {
-      image = ImageIO.read(new File(s.skinfolder+file));       
@@ -132 +157 @@
-      }
-      for(int i=0;i<SubBitmaps.size();i++) {
-
+Image
-      }
-    }
@@ -142 +167 @@
-    }    
-  }
-String id_, String file_, String alphacolor_, int nbframes_, int fps_
-
-
-nbframes_
-fps_; 
-
-
+
+tf.getText()
+tf.getText()
+Integer.parseInt(nbframes_tf.getText())
+Integer.parseInt(fps_tf.getText());
+tf.getText()
+tf.getText()
-      s.updateResources();
-      s.expandResource(id);
-    }
-
+Image
-  }
-  public void showOptions() {
@@ -296 +321 @@
-      }      
-      frame.setVisible(false);
-id_tf.getText(),file_tf.getText(),alphacolor_tf.getText(),Integer.parseInt(nbframes_tf.getText()),Integer.parseInt(fps_tf.getText())
+
-    }
-    else if(e.getSource().equals(help_btn)) {

trunk/src/vlcskineditor/Resources/BitmapFont.java

@@ -29 +29 @@
-/**
- * Represents a BitmapFont
-,
-you can't create a new
+.
+You can't create or edit a
- * @author Daniel Dreibrodt
- */
@@ -47 +47 @@
-    }
-  }
+  public void update() {
+    
+  }
-  public void showOptions() {
-    

trunk/src/vlcskineditor/Resources/Font.java

@@ -46 +46 @@
-  JButton file_btn, ok_btn, cancel_btn, help_btn;
-  JFileChooser fc;
+  /**
+   * The font represented by this Font object as a Java AWT Font.
+   */
-  public java.awt.Font f;
-  
-
+
+
+
+
+
-  public Font(String xmlcode, Skin s_) {
-    type = "Font";
@@ -81 +88 @@
-    }
-  }
+  /**
+   * Creates a new Font from the given attributes.
+   * @param id_ The ID of the Font.
+   * @param file_ The relative path to the font file.
+   * @param size_ The Font's size.
+   * @param s_ The Skin in which the Font is used.
+   */
-  public Font(String id_,String file_,int size_, Skin s_) {
-    type="Font";
@@ -111 +125 @@
-    }
-  }
+  /**
+   * Creates a new Font from a given file.
+   * @param s_ The skin in which the Font is used.
+   * @param f_ The font file. TrueType or OpenType. Notice that only OpenType fonts in a TrueType container
+   * can be displayed by the Skin Editor. VLC can display both.
+   */
-  public Font(Skin s_, File f_) {
-    s = s_;
@@ -144 +164 @@
-    }    
-  }
+  /**
+   * Creates a new Font from user input.
+   * @param s_ The skin in which the Font is used.
+   */
-  public Font(Skin s_) {
-    s=s_;

trunk/src/vlcskineditor/Resources/SubBitmap.java

@@ -35 +35 @@
-/**
- * Handles SubBitmap resources
+ * @see Bitmap
- * @author Daniel
- */
@@ -44 +45 @@
-  final int FPS_DEFAULT = 0;
-  int fps = FPS_DEFAULT;
+  //The image represented by the SubBitmap
-  public BufferedImage image; 
+  //The parent bitmap
-  private Bitmap parent;
-  
@@ -54 +57 @@
-  boolean created = false;
-  
-
+
+
+
+
+
+
-  public SubBitmap(String xmlcode, Skin s_, Bitmap parent_) {
-    type="Bitmap";
@@ -66 +74 @@
-    created = true;
-  }  
+  /**
+   * Creates a new SubBitmap from user input.
+   * @param s_ The skin in which the SubBitmap is used.
+   * @param parent_ The parent Bitmap.
+   */
-  public SubBitmap(Skin s_,Bitmap parent_) {
-    s=s_;
@@ -77 +90 @@
-    showOptions();        
-  }
-
+
+
+
+
-    if(parent.image != null) image = parent.image.getSubimage(x,y,width,height);        
-  }  
-String id_, int x_, int y_, int width_, int height_, int nbframes_, int fps_
-
-x_
-y_
-width_
-height_
-nbframes_
-fps_; 
+
+tf.getText()
+Integer.parseInt(x_tf.getText())
+Integer.parseInt(y_tf.getText())
+Integer.parseInt(width_tf.getText())
+Integer.parseInt(height_tf.getText())
+Integer.parseInt(nbframes_tf.getText())
+Integer.parseInt(fps_tf.getText());
-    frame.setDefaultCloseOperation(frame.HIDE_ON_CLOSE);    
-
+Image
-    s.updateResources();
-    s.expandResource(id);
@@ -224 +240 @@
-      }
-      frame.setVisible(false);
-id_tf.getText(),Integer.parseInt(x_tf.getText()),Integer.parseInt(y_tf.getText()),Integer.parseInt(width_tf.getText()),Integer.parseInt(height_tf.getText()),Integer.parseInt(nbframes_tf.getText()),Integer.parseInt(fps_tf.getText())
+
-    }
-    else if(e.getSource().equals(help_btn)) {