Attachment 119045 Details for Bug 249377 – Patch with bug fixes

[patch] Patch with bug fixes

mtjbug-249377.patch (text/plain), 26.43 KB, created by David Marques

on 2008-11-28 15:06:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David Marques

Created: 2008-11-28 15:06:22 EST

Size: 26.43 KB

patch

obsolete

>Index: src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/MidletsModel.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/MidletsModel.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/MidletsModel.java	(working copy)
>@@ -8,6 +8,7 @@
>  * 
>  * Contributors:
>  *     Diego Sandin (Motorola) - Initial implementation
>+ *     David Marques(Motorola) - Enabling MIDlets ordering.
>  */
> package org.eclipse.mtj.ui.internal.editors.jad.form.pages;
> 
>@@ -22,6 +23,30 @@
>  */
> public class MidletsModel implements IModel {
> 
>+    public static enum Direction {
>+        UP(-1), DOWN(+1);
>+        
>+        int value;
>+        
>+        /**
>+         * Creates a Direction.
>+         * 
>+         * @param value direction value.
>+         */
>+        Direction(int value) {
>+            this.value = value;
>+        }
>+        
>+        /**
>+         * Gets the direction value.
>+         * 
>+         * @return value
>+         */
>+        public int getValue() {
>+            return this.value;
>+        }
>+    }
>+	
>     private ArrayList<IModelListener> modelListeners;
> 
>     private ArrayList<NamedObject> objects;
>@@ -54,6 +79,33 @@
>         }
>     }
> 
>+    /**
>+	 * Reorders the object position according to the specified direction.
>+	 * 
>+	 * @param obj
>+	 *            object to reorder.
>+	 * @param direction
>+	 *            ordering direction.
>+	 */
>+	public void reorder(NamedObject obj, Direction direction) {
>+		for (int i = 0; i < objects.size(); i++) {
>+			NamedObject target = objects.get(i);
>+			if (target == obj) {
>+				if ((direction == Direction.DOWN && i == objects.size() - 1)
>+						|| (direction == Direction.UP && i == 0x00)) {
>+					return;
>+				}
>+
>+				objects.remove(i);
>+				i += direction.getValue();
>+				objects.add(i, obj);
>+
>+				fireModelChanged(new Object[] { obj }, IModelListener.ADDED, "");
>+				break;
>+			}
>+		}
>+	}
>+    
>     /*
>      * (non-Javadoc)
>      * 
>Index: src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/MidletsEditorPage.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/MidletsEditorPage.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/MidletsEditorPage.java	(working copy)
>@@ -12,6 +12,7 @@
>  *                                standards
>  *     Gang Ma      (Sybase)	- Refactoring the page to add expansibilities
>  *     Diego Sandin (Motorola)  - Fixed error in  new MIDlet entry name generation
>+ *     David Marques(Motorola)  - Enabling Up and Down buttons.
>  */
> package org.eclipse.mtj.ui.internal.editors.jad.form.pages;
> 
>@@ -31,6 +32,7 @@
> import org.eclipse.mtj.ui.editors.models.IModelListener;
> import org.eclipse.mtj.ui.internal.MTJUIPlugin;
> import org.eclipse.mtj.ui.internal.editors.jad.form.JADFormEditor;
>+import org.eclipse.mtj.ui.internal.editors.jad.form.pages.MidletsModel.Direction;
> import org.eclipse.mtj.ui.internal.forms.blocks.ButtonBarBlock;
> import org.eclipse.mtj.ui.internal.forms.blocks.DetailPage;
> import org.eclipse.mtj.ui.internal.forms.blocks.MasterLabelProvider;
>@@ -52,410 +54,496 @@
>  * @author Craig Setera
>  */
> public class MidletsEditorPage extends AbstractJADEditorPage implements
>-        IModelListener {
>+		IModelListener {
>+
>+	/**
>+	 * Content providers for structured viewers.
>+	 */
>+	class MasterContentProvider implements IStructuredContentProvider {
> 
>-    /**
>-     * Content providers for structured viewers.
>-     */
>-    class MasterContentProvider implements IStructuredContentProvider {
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
>+		 */
>+		public void dispose() {
>+		}
> 
>-        /*
>-         * (non-Javadoc)
>-         * 
>-         * @see org.eclipse.jface.viewers.IContentProvider#dispose()
>-         */
>-        public void dispose() {
>-        }
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see
>+		 * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(
>+		 * java.lang.Object)
>+		 */
>+		public Object[] getElements(Object inputElement) {
>+			return model.getContents();
>+		}
> 
>-        /*
>-         * (non-Javadoc)
>-         * 
>-         * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
>-         */
>-        public Object[] getElements(Object inputElement) {
>-            return model.getContents();
>-        }
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see
>+		 * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse
>+		 * .jface.viewers.Viewer, java.lang.Object, java.lang.Object)
>+		 */
>+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
>+		}
>+	}
> 
>-        /*
>-         * (non-Javadoc)
>-         * 
>-         * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
>-         *      java.lang.Object, java.lang.Object)
>-         */
>-        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
>-        }
>-    }
>+	/**
>+	 * A label provider implementation.
>+	 */
>+	class MidletMasterLabelProvider extends MasterLabelProvider {
> 
>-    /**
>-     * A label provider implementation.
>-     */
>-    class MidletMasterLabelProvider extends MasterLabelProvider {
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see
>+		 * org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java
>+		 * .lang.Object, int)
>+		 */
>+		@Override
>+		public Image getColumnImage(Object obj, int index) {
> 
>-        /*
>-         * (non-Javadoc)
>-         * 
>-         * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object,
>-         *      int)
>-         */
>-        @Override
>-        public Image getColumnImage(Object obj, int index) {
>+			return MTJUIPlugin
>+					.getImageFromCache(IMTJUIConstants.IMG_MIDLET_ICON);
> 
>-            return MTJUIPlugin
>-                    .getImageFromCache(IMTJUIConstants.IMG_MIDLET_ICON);
>+		}
> 
>-        }
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see
>+		 * org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.
>+		 * lang.Object, int)
>+		 */
>+		@Override
>+		public String getColumnText(Object obj, int index) {
>+			return ((MidletType) obj).getName();
>+		}
>+	}
> 
>-        /*
>-         * (non-Javadoc)
>-         * 
>-         * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object,
>-         *      int)
>-         */
>-        @Override
>-        public String getColumnText(Object obj, int index) {
>-            return ((MidletType) obj).getName();
>-        }
>-    }
>+	/**
>+	 * The page unique identifier
>+	 */
>+	public static final String MIDLETS_PAGEID = "midlets"; //$NON-NLS-1$
> 
>-    /**
>-     * The page unique identifier
>-     */
>-    public static final String MIDLETS_PAGEID = "midlets"; //$NON-NLS-1$
>+	/**
>+	 * The prefix of all MIDlet definition properties
>+	 */
>+	public static final String MIDLET_PREFIX = "MIDlet-"; //$NON-NLS-1$
> 
>-    /**
>-     * The prefix of all MIDlet definition properties
>-     */
>-    public static final String MIDLET_PREFIX = "MIDlet-"; //$NON-NLS-1$
>+	/**
>+	 * Get a string value from the resource bundle
>+	 * 
>+	 * @param key
>+	 *            the key for the desired string
>+	 * @return the string for the given key, or the key itself if no string was
>+	 *         found
>+	 */
>+	private static String getResourceString(String key) {
>+		return MTJUIStrings.getString(key);
>+	}
> 
>-    /**
>-     * Get a string value from the resource bundle
>-     * 
>-     * @param key the key for the desired string
>-     * @return the string for the given key, or the key itself if no string was
>-     *         found
>-     */
>-    private static String getResourceString(String key) {
>-        return MTJUIStrings.getString(key);
>-    }
>+	/**
>+	 * The amount of MIDlets listed.
>+	 */
>+	private int midletcount = 0;
> 
>-    /**
>-     * The amount of MIDlets listed.
>-     */
>-    private int midletcount = 0;
>+	/** The original MIDlet count as stored */
>+	private int storedMidletCount;
> 
>-    /** The original MIDlet count as stored */
>-    private int storedMidletCount;
>+	/**
>+	 * The Add MIDlets button
>+	 */
>+	private Button add;
> 
>-    /**
>-     * The Add MIDlets button
>-     */
>-    private Button add;
>+	/**
>+	 * The Remove MIDlets button
>+	 */
>+	private Button remove;
> 
>-    /**
>-     * The Remove MIDlets button
>-     */
>-    private Button remove;
>+	/**
>+	 * The model based on the MIDlets listed.
>+	 */
>+	private MidletsModel model;
> 
>-    /**
>-     * The model based on the MIDlets listed.
>-     */
>-    private MidletsModel model;
>+	private ScrolledPropertiesBlock block;
> 
>-    private ScrolledPropertiesBlock block;
>+	List<DetailPage> list = new ArrayList<DetailPage>();
> 
>-    List<DetailPage> list = new ArrayList<DetailPage>();
>+	private Button up;
> 
>-    /**
>-     * Creates a new page for MIDlets edition, with default description. The
>-     * parent editor need to be passed in the <code>initialize</code> method
>-     * if this constructor is used.
>-     */
>-    public MidletsEditorPage() {
>-        super(MIDLETS_PAGEID, getResourceString("editor.jad.tab.midlets")); //$NON-NLS-1$
>-        model = new MidletsModel(null);
>-        model.addModelListener(this);
>-    }
>+	private Button down;
> 
>-    /**
>-     * Creates a new page for MIDlets edition.
>-     * 
>-     * @param editor The parent editor
>-     * @param title the page title
>-     */
>-    public MidletsEditorPage(JADFormEditor editor, String title) {
>-        super(editor, MIDLETS_PAGEID, title);
>-        model = new MidletsModel(null);
>-        model.addModelListener(this);
>-    }
>+	/**
>+	 * Creates a new page for MIDlets edition, with default description. The
>+	 * parent editor need to be passed in the <code>initialize</code> method if
>+	 * this constructor is used.
>+	 */
>+	public MidletsEditorPage() {
>+		super(MIDLETS_PAGEID, getResourceString("editor.jad.tab.midlets")); //$NON-NLS-1$
>+		model = new MidletsModel(null);
>+		model.addModelListener(this);
>+	}
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.ui.forms.editor.FormPage#doSave(org.eclipse.core.runtime.IProgressMonitor)
>-     */
>-    @Override
>-    public void doSave(IProgressMonitor monitor) {
>+	/**
>+	 * Creates a new page for MIDlets edition.
>+	 * 
>+	 * @param editor
>+	 *            The parent editor
>+	 * @param title
>+	 *            the page title
>+	 */
>+	public MidletsEditorPage(JADFormEditor editor, String title) {
>+		super(editor, MIDLETS_PAGEID, title);
>+		model = new MidletsModel(null);
>+		model.addModelListener(this);
>+	}
> 
>-        IPreferenceStore store = getPreferenceStore();
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see
>+	 * org.eclipse.ui.forms.editor.FormPage#doSave(org.eclipse.core.runtime.
>+	 * IProgressMonitor)
>+	 */
>+	@Override
>+	public void doSave(IProgressMonitor monitor) {
> 
>-        int i;
>+		IPreferenceStore store = getPreferenceStore();
> 
>-        Object midlets[] = model.getContents();
>+		int i;
> 
>-        int currentMidletCount = midlets.length;
>+		Object midlets[] = model.getContents();
> 
>-        for (i = 0; i < currentMidletCount; i++) {
>-            store.setValue(MIDLET_PREFIX + (i + 1), ((MidletType) midlets[i])
>-                    .toString());
>-        }
>+		int currentMidletCount = midlets.length;
> 
>-        for (; i < storedMidletCount; i++) {
>-            store.setToDefault(MIDLET_PREFIX + (i + 1));
>-        }
>+		for (i = 0; i < currentMidletCount; i++) {
>+			store.setValue(MIDLET_PREFIX + (i + 1), ((MidletType) midlets[i])
>+					.toString());
>+		}
> 
>-        midletcount = currentMidletCount;
>-        storedMidletCount = currentMidletCount;
>+		for (; i < storedMidletCount; i++) {
>+			store.setToDefault(MIDLET_PREFIX + (i + 1));
>+		}
> 
>-        setDirty(false);
>-    }
>+		midletcount = currentMidletCount;
>+		storedMidletCount = currentMidletCount;
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.mtj.ui.editors.jad.AbstractJADEditorPage#editorInputChanged()
>-     */
>-    @Override
>-    public void editorInputChanged() {
>+		setDirty(false);
>+	}
> 
>-        // if the file has been updated external to Eclipse, the model must be
>-        // reseted
>-        if (model != null) {
>-            model.clear();
>-        }
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see
>+	 * org.eclipse.mtj.ui.editors.jad.AbstractJADEditorPage#editorInputChanged()
>+	 */
>+	@Override
>+	public void editorInputChanged() {
> 
>-        midletcount = 0;
>+		// if the file has been updated external to Eclipse, the model must be
>+		// reseted
>+		if (model != null) {
>+			model.clear();
>+		}
> 
>-        updateMidletProperties();
>+		midletcount = 0;
> 
>-        if (block != null) {
>-            block.refresh();
>-        }
>-    }
>+		updateMidletProperties();
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.ui.part.WorkbenchPart#getTitle()
>-     */
>-    @Override
>-    public String getTitle() {
>+		if (block != null) {
>+			block.refresh();
>+		}
>+	}
> 
>-        return getResourceString("editor.jad.tab.midlets"); //$NON-NLS-1$
>-    }
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ui.part.WorkbenchPart#getTitle()
>+	 */
>+	@Override
>+	public String getTitle() {
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.mtj.ui.editors.jad.AbstractJADEditorPage#isManagingProperty(java.lang.String)
>-     */
>-    @Override
>-    public boolean isManagingProperty(String property) {
>-        boolean manages = property.startsWith(MIDLET_PREFIX);
>-        if (manages) {
>-            String value = property.substring(MIDLET_PREFIX.length());
>-            try {
>-                Integer.parseInt(value);
>-            } catch (NumberFormatException e) {
>-                manages = false;
>-            }
>-        }
>+		return getResourceString("editor.jad.tab.midlets"); //$NON-NLS-1$
>+	}
> 
>-        return manages;
>-    }
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see
>+	 * org.eclipse.mtj.ui.editors.jad.AbstractJADEditorPage#isManagingProperty
>+	 * (java.lang.String)
>+	 */
>+	@Override
>+	public boolean isManagingProperty(String property) {
>+		boolean manages = property.startsWith(MIDLET_PREFIX);
>+		if (manages) {
>+			String value = property.substring(MIDLET_PREFIX.length());
>+			try {
>+				Integer.parseInt(value);
>+			} catch (NumberFormatException e) {
>+				manages = false;
>+			}
>+		}
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.mtj.ui.internal.editors.jad.form.pages.block.IModelListener#modelChanged(java.lang.Object[],
>-     *      java.lang.String, java.lang.String)
>-     */
>-    public void modelChanged(Object[] objects, String type, String property) {
>-        block.refresh();
>-        setDirty(true);
>-    }
>+		return manages;
>+	}
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.ui.forms.editor.FormPage#setFocus()
>-     */
>-    @Override
>-    public void setFocus() {
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see
>+	 * org.eclipse.mtj.ui.internal.editors.jad.form.pages.block.IModelListener
>+	 * #modelChanged(java.lang.Object[], java.lang.String, java.lang.String)
>+	 */
>+	public void modelChanged(Object[] objects, String type, String property) {
>+		block.refresh();
>+		setDirty(true);
>+	}
> 
>-    }
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ui.forms.editor.FormPage#setFocus()
>+	 */
>+	@Override
>+	public void setFocus() {
> 
>-    /**
>-     * Adds mouse listeners to the add and remove buttons.
>-     */
>-    private void addMouseListenersToButtons() {
>+	}
> 
>-        add.addMouseListener(new MouseListener() {
>+	/**
>+	 * Adds mouse listeners to the add and remove buttons.
>+	 */
>+	private void addMouseListenersToButtons() {
> 
>-            public void mouseDoubleClick(MouseEvent e) {
>+		add.addMouseListener(new MouseListener() {
> 
>-            }
>+			public void mouseDoubleClick(MouseEvent e) {
> 
>-            public void mouseDown(MouseEvent e) {
>-                midletcount = model.getContents().length + 1;
>-                String midletName = MIDLET_PREFIX + String.valueOf(midletcount);
>+			}
> 
>-                model.add(new NamedObject[] { new MidletType(midletName,
>-                        midletName, "", "") }, true);
>-                remove.setEnabled(true);
>-                block.refresh();
>+			public void mouseDown(MouseEvent e) {
>+				midletcount = model.getContents().length + 1;
>+				String midletName = MIDLET_PREFIX + String.valueOf(midletcount);
> 
>-            }
>+				model.add(new NamedObject[] { new MidletType(midletName,
>+						midletName, "", "") }, true);
>+				remove.setEnabled(true);
> 
>-            public void mouseUp(MouseEvent e) {
>+				if (midletcount > 0x01) {
>+					up.setEnabled(true);
>+					down.setEnabled(true);
>+				}
> 
>-            }
>-        });
>+				block.refresh();
> 
>-        remove.addMouseListener(new MouseListener() {
>+			}
> 
>-            public void mouseDoubleClick(MouseEvent e) {
>+			public void mouseUp(MouseEvent e) {
> 
>-            }
>+			}
>+		});
> 
>-            public void mouseDown(MouseEvent e) {
>-                IStructuredSelection ssel = (IStructuredSelection) block
>-                        .getCurrentSelectedItem();
>+		remove.addMouseListener(new MouseListener() {
> 
>-                if (ssel.size() == 1) {
>-                    MidletType type = (MidletType) ssel.getFirstElement();
>-                    model.remove(new MidletType[] { type }, true);
>-                    midletcount = model.getContents().length;
>-                    if (midletcount == 0) {
>-                        remove.setEnabled(false);
>-                    }
>-                }
>-            }
>+			public void mouseDoubleClick(MouseEvent e) {
> 
>-            public void mouseUp(MouseEvent e) {
>+			}
> 
>-            }
>-        });
>-    }
>+			public void mouseDown(MouseEvent e) {
>+				IStructuredSelection ssel = (IStructuredSelection) block
>+						.getCurrentSelectedItem();
> 
>-    /**
>-     * Update the MIDlet properties from the current preference store.
>-     */
>-    private void updateMidletProperties() {
>-        IPreferenceStore store = getPreferenceStore();
>+				if (ssel.size() == 1) {
>+					MidletType type = (MidletType) ssel.getFirstElement();
>+					model.remove(new MidletType[] { type }, true);
>+					midletcount = model.getContents().length;
>+					if (midletcount == 0) {
>+						remove.setEnabled(false);
>+					}
> 
>-        // This is sort of ugly, but IPreferenceStore does not
>-        // allow getting the complete list of preference keys
>-        List<MidletType> midlets = new ArrayList<MidletType>();
>+					if (midletcount > 0x01) {
>+						up.setEnabled(true);
>+						down.setEnabled(true);
>+					}
>+				}
>+			}
> 
>-        for (int i = 1; i < 1000; i++) {
>-            String propName = MIDLET_PREFIX + i;
>+			public void mouseUp(MouseEvent e) {
> 
>-            if (store.contains(propName)) {
>-                String propValue = store.getString(propName);
>+			}
>+		});
> 
>-                MidletType midletType = new MidletType(propName, propValue);
>-                midletType.setName(midletType.getMidletName(), false);
>+		up.addMouseListener(new MouseListener() {
>+			public void mouseDoubleClick(MouseEvent e) {
>+			}
> 
>-                midlets.add(midletType);
>-                storedMidletCount++;
>-            } else {
>-                break;
>-            }
>-        }
>+			public void mouseUp(MouseEvent e) {
>+			}
> 
>-        midletcount = storedMidletCount;
>+			public void mouseDown(MouseEvent e) {
>+				if (up.isEnabled()) {
>+					IStructuredSelection seletion = (IStructuredSelection) block
>+							.getCurrentSelectedItem();
> 
>-        if (!midlets.isEmpty()) {
>-            model.add(midlets.toArray(new NamedObject[0]), false);
>-        }
>-    }
>+					if (seletion.size() == 1) {
>+						MidletType type = (MidletType) seletion
>+								.getFirstElement();
>+						model.reorder(type, Direction.UP);
>+					}
>+				}
>+			}
>+		});
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.mtj.ui.editors.jad.AbstractJADEditorPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
>-     */
>-    @Override
>-    protected void createFormContent(IManagedForm managedForm) {
>+		down.addMouseListener(new MouseListener() {
>+			public void mouseDoubleClick(MouseEvent e) {
>+			}
> 
>-        list.add(new DetailPage(MidletType.class, new MidletTypeDetailsPage(
>-                getJavaProject())));
>-        block = new ScrolledPropertiesBlock(this, new MasterContentProvider(),
>-                new MidletMasterLabelProvider(), list);
>+			public void mouseUp(MouseEvent e) {
>+			}
> 
>-        final ScrolledForm form = managedForm.getForm();
>-        FormToolkit toolkit = managedForm.getToolkit();
>+			public void mouseDown(MouseEvent e) {
>+				if (down.isEnabled()) {
>+					IStructuredSelection seletion = (IStructuredSelection) block
>+							.getCurrentSelectedItem();
> 
>-        form.setText(getTitle());
>-        toolkit.decorateFormHeading(form.getForm());
>+					if (seletion.size() == 1) {
>+						MidletType type = (MidletType) seletion
>+								.getFirstElement();
>+						model.reorder(type, Direction.DOWN);
>+					}
>+				}
>+			}
>+		});
> 
>-        createErrorMessageHandler(managedForm);
>+	}
> 
>-        /*
>-         * launch the help system UI, displaying the documentation identified by
>-         * the href parameter.
>-         */
>-        final String href = getHelpResource();
>-        if (href != null) {
>-            IToolBarManager manager = form.getToolBarManager();
>-            Action helpAction = new Action("help") { //$NON-NLS-1$
>-                @Override
>-                public void run() {
>-                    PlatformUI.getWorkbench().getHelpSystem()
>-                            .displayHelpResource(href);
>-                }
>-            };
>+	/**
>+	 * Update the MIDlet properties from the current preference store.
>+	 */
>+	private void updateMidletProperties() {
>+		IPreferenceStore store = getPreferenceStore();
> 
>-            helpAction.setImageDescriptor(MTJUIPlugin
>-                    .getIconImageDescriptor(IMTJUIConstants.IMG_LINKTOHELP));
>-            manager.add(helpAction);
>-        }
>-        form.updateToolBar();
>+		// This is sort of ugly, but IPreferenceStore does not
>+		// allow getting the complete list of preference keys
>+		List<MidletType> midlets = new ArrayList<MidletType>();
> 
>-        block.createContent(managedForm);
>+		for (int i = 1; i < 1000; i++) {
>+			String propName = MIDLET_PREFIX + i;
> 
>-        add = block.getButtonBarBlock().getButton(
>-                ButtonBarBlock.BUTTON_ADD_INDEX);
>-        add.setEnabled(true);
>+			if (store.contains(propName)) {
>+				String propValue = store.getString(propName);
> 
>-        remove = block.getButtonBarBlock().getButton(
>-                ButtonBarBlock.BUTTON_REMOVE_INDEX);
>+				MidletType midletType = new MidletType(propName, propValue);
>+				midletType.setName(midletType.getMidletName(), false);
> 
>-        addMouseListenersToButtons();
>-        if (midletcount > 0) {
>-            remove.setEnabled(true);
>-        }
>-    }
>+				midlets.add(midletType);
>+				storedMidletCount++;
>+			} else {
>+				break;
>+			}
>+		}
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.mtj.ui.editors.jad.AbstractJADEditorPage#getHelpResource()
>-     */
>-    @Override
>-    protected String getHelpResource() {
>-        return "/org.eclipse.mtj.doc.user/html/reference/editors/jad_editor/midlets.html"; //$NON-NLS-1$
>-    }
>+		midletcount = storedMidletCount;
> 
>-    /*
>-     * (non-Javadoc)
>-     * 
>-     * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
>-     */
>-    @Override
>-    protected void setInput(IEditorInput input) {
>-        super.setInput(input);
>-        setDirty(false);
>-        updateMidletProperties();
>-    }
>+		if (!midlets.isEmpty()) {
>+			model.add(midlets.toArray(new NamedObject[0]), false);
>+		}
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see
>+	 * org.eclipse.mtj.ui.editors.jad.AbstractJADEditorPage#createFormContent
>+	 * (org.eclipse.ui.forms.IManagedForm)
>+	 */
>+	@Override
>+	protected void createFormContent(IManagedForm managedForm) {
>+
>+		list.add(new DetailPage(MidletType.class, new MidletTypeDetailsPage(
>+				getJavaProject())));
>+		block = new ScrolledPropertiesBlock(this, new MasterContentProvider(),
>+				new MidletMasterLabelProvider(), list);
>+
>+		final ScrolledForm form = managedForm.getForm();
>+		FormToolkit toolkit = managedForm.getToolkit();
>+
>+		form.setText(getTitle());
>+		toolkit.decorateFormHeading(form.getForm());
>+
>+		createErrorMessageHandler(managedForm);
>+
>+		/*
>+		 * launch the help system UI, displaying the documentation identified by
>+		 * the href parameter.
>+		 */
>+		final String href = getHelpResource();
>+		if (href != null) {
>+			IToolBarManager manager = form.getToolBarManager();
>+			Action helpAction = new Action("help") { //$NON-NLS-1$
>+				@Override
>+				public void run() {
>+					PlatformUI.getWorkbench().getHelpSystem()
>+							.displayHelpResource(href);
>+				}
>+			};
>+
>+			helpAction.setImageDescriptor(MTJUIPlugin
>+					.getIconImageDescriptor(IMTJUIConstants.IMG_LINKTOHELP));
>+			manager.add(helpAction);
>+		}
>+		form.updateToolBar();
>+
>+		block.createContent(managedForm);
>+
>+		add = block.getButtonBarBlock().getButton(
>+				ButtonBarBlock.BUTTON_ADD_INDEX);
>+		add.setEnabled(true);
>+
>+		remove = block.getButtonBarBlock().getButton(
>+				ButtonBarBlock.BUTTON_REMOVE_INDEX);
>+
>+		up = block.getButtonBarBlock()
>+				.getButton(ButtonBarBlock.BUTTON_UP_INDEX);
>+
>+		down = block.getButtonBarBlock().getButton(
>+				ButtonBarBlock.BUTTON_DOWN_INDEX);
>+
>+		addMouseListenersToButtons();
>+		if (midletcount > 0) {
>+			remove.setEnabled(true);
>+
>+			if (midletcount > 0x01) {
>+				up.setEnabled(true);
>+				down.setEnabled(true);
>+			}
>+		}
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see
>+	 * org.eclipse.mtj.ui.editors.jad.AbstractJADEditorPage#getHelpResource()
>+	 */
>+	@Override
>+	protected String getHelpResource() {
>+		return "/org.eclipse.mtj.doc.user/html/reference/editors/jad_editor/midlets.html"; //$NON-NLS-1$
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
>+	 */
>+	@Override
>+	protected void setInput(IEditorInput input) {
>+		super.setInput(input);
>+		setDirty(false);
>+		updateMidletProperties();
>+	}
> }

Flags:

wgp010: iplog+
wgp010: review+

Actions: View | Diff

Attachments on bug 249377: 119045