Attachment #120527 for bug #257362

Lines 7-16 Link Here

(-)src/org/eclipse/mtj/internal/core/text/l10n/L10nLocale.java (-1 / +72 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Diego Sandin (Motorola) - Initial Version	10	* Diego Sandin (Motorola) - Initial Version
		11	* David Marques (Motorola) - Implementing validation.
11	*/	12	*/
12	package org.eclipse.mtj.internal.core.text.l10n;	13	package org.eclipse.mtj.internal.core.text.l10n;
13		14
		15	import java.util.LinkedList;
		16	import java.util.List;
14	import java.util.Locale;	17	import java.util.Locale;
15	import java.util.StringTokenizer;	18	import java.util.StringTokenizer;
16		19
Lines 17-22 Link Here
17	import org.eclipse.core.runtime.IStatus;	20	import org.eclipse.core.runtime.IStatus;
18	import org.eclipse.core.runtime.Status;	21	import org.eclipse.core.runtime.Status;
19	import org.eclipse.mtj.core.IMTJCoreConstants;	22	import org.eclipse.mtj.core.IMTJCoreConstants;
		23	import org.eclipse.mtj.core.internal.MTJCorePlugin;
		24	import org.eclipse.mtj.internal.core.text.IDocumentElementNode;
20	import org.eclipse.osgi.util.NLS;	25	import org.eclipse.osgi.util.NLS;
21		26
22	public class L10nLocale extends L10nObject {	27	public class L10nLocale extends L10nObject {
Lines 138-146 Link Here
138	setStatus(new Status(IStatus.OK, IMTJCoreConstants.PLUGIN_ID,	143	setStatus(new Status(IStatus.OK, IMTJCoreConstants.PLUGIN_ID,
139	"Valid Locale"));	144	"Valid Locale"));
140	}	145	}
		146
		147	syncronizeKeyStates();
		148	}
		149
		150	/**
		151	* This method synchronizes the state of all entries in the locale.
		152	*
		153	* @param locale target locale.
		154	*/
		155	private void syncronizeKeyStates() {
		156	IDocumentElementNode[] entryNodes = this.getChildNodes();
		157	List<L10nEntry> cache = new LinkedList<L10nEntry>();
		158	for (IDocumentElementNode entryNode : entryNodes) {
		159	L10nEntry entry = (L10nEntry) entryNode;
		160	if (!cache.contains(entry)) {
		161	List<L10nEntry> duplicates = this
		162	.findDuplicatedEntries(entry);
		163	if (duplicates.size() > 0) {
		164	for (L10nEntry duplicate : duplicates) {
		165	duplicate.setStatus(new Status(IStatus.ERROR,
		166	MTJCorePlugin.PLUGIN_ID, null));
		167	cache.add(duplicate);
		168	}
		169	entry.setStatus(new Status(IStatus.ERROR,
		170	MTJCorePlugin.PLUGIN_ID, null));
		171	} else {
		172	entry.setStatus(new Status(IStatus.OK,
		173	MTJCorePlugin.PLUGIN_ID, null));
		174	}
		175	}
		176	}
		177	}
		178
		179	/**
		180	* This method returns a list of all locale entries containing the
		181	* specified key.
		182	*
		183	* @param locale target locale.
		184	* @param key entry key.
		185	* @return duplicated entries.
		186	*/
		187	private List<L10nEntry> findDuplicatedEntries(L10nLocale locale,
		188	String key) {
		189	List<L10nEntry> duplicates = new LinkedList<L10nEntry>();
		190	IDocumentElementNode nodes[] = locale.getChildNodes();
		191	for (IDocumentElementNode node : nodes) {
		192	L10nEntry entry = (L10nEntry) node;
		193	if (entry.getKey().toUpperCase().equals(key.toUpperCase())) {
		194	duplicates.add(entry);
		195	}
		196	}
		197	return duplicates;
141	}	198	}
142		199
143	/**	200	/**
		201	* This method finds all locale entries duplicated with the specified
		202	* locale.
		203	*
		204	* @param localeEntry target locale.
		205	* @return duplicated entries.
		206	*/
		207	public List<L10nEntry> findDuplicatedEntries(L10nEntry localeEntry) {
		208	List<L10nEntry> duplicates = findDuplicatedEntries(
		209	(L10nLocale) localeEntry.getParent(), localeEntry.getKey());
		210	duplicates.remove(localeEntry);
		211	return duplicates;
		212	}
		213
		214	/**
144	* Since the compatibility with the LOcalization Data from MTJ version	215	* Since the compatibility with the LOcalization Data from MTJ version
145	* 0.9.1RC1 was broken, we try to convert the old XML format to the new one	216	* 0.9.1RC1 was broken, we try to convert the old XML format to the new one
146	*/	217	*/

Lines 7-16 Link Here

(-)src/org/eclipse/mtj/internal/core/text/l10n/L10nLocales.java (-1 / +10 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Diego Sandin (Motorola) - Initial version	10	* Diego Sandin (Motorola) - Initial version
		11	* David Marques (Motorola) - Implementing validation.
11	*/	12	*/
12	package org.eclipse.mtj.internal.core.text.l10n;	13	package org.eclipse.mtj.internal.core.text.l10n;
13		14
		15	import org.eclipse.mtj.internal.core.text.IDocumentElementNode;
		16
		17
14	/**	18	/**
15	* @since 0.9.1	19	* @since 0.9.1
16	*/	20	*/
Lines 129-134 Link Here
129	*/	133	*/
130	@Override	134	@Override
131	public void validate() {	135	public void validate() {
		136	IDocumentElementNode[] localeNodes = this.getChildNodes();
		137	for (IDocumentElementNode localeNode : localeNodes) {
		138	L10nLocale locale = (L10nLocale) localeNode;
		139	locale.validate();
		140	}
132	}	141	}
133		142
134	}	143	}




 *     David Marques (Motorola) - Fixing propeties folder path
 *     David Marques (Motorola) - Removing old classes from L10n API
 *                                upon API creation.
 *     David Marques (Motorola) - Generating keys on upper case.
 */
package org.eclipse.mtj.internal.core.l10n;


            IDocumentElementNode[] entryNodes = locale.getChildNodes();
            for (int i = 0; i < entryNodes.length; i++) {
                L10nEntry entry = (L10nEntry) entryNodes[i];
                if (!keys.contains(entry.getKey().toUpperCase())) {
                    keys.add(entry.getKey().toUpperCase());
                }
            }
        }

    private static String writeStringConstantDeclaration(String name,
            String value) {
        return NLS.bind("\t\tpublic static final String {0} = \"{1}\";\n",
                new String[] { name.replace("-", "_"), value});
    }
    
    /**




 * 
 * Contributors:
 *     Diego Sandin (Motorola) - Initial Version
 *     David Marques (Motorola) - Synchronizing key states with outline. 
 */
package org.eclipse.mtj.internal.ui.editors.l10n.details;


import org.eclipse.mtj.internal.ui.editor.FormEntryAdapter;
import org.eclipse.mtj.internal.ui.editors.l10n.L10nInputContext;
import org.eclipse.mtj.internal.ui.editors.l10n.LocalesTreeSection;
import org.eclipse.mtj.internal.ui.editors.l10n.LocalizationDataEditor;
import org.eclipse.mtj.ui.internal.forms.parts.FormEntry;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.IFormPart;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.events.HyperlinkEvent;

public class L10nEntryDetails extends L10nAbstractDetails {

     */
    private void createLocaleEntryListeners() {
        keyEntry.setFormEntryListener(new FormEntryAdapter(this) {
            
            public void textValueChanged(FormEntry entry) {
                // Ensure data object is defined
                if (localeEntry != null) {

                if (localeEntry != null) {
                    {
                        localeEntry.setKey(keyEntry.getValue());
                        localeEntry.getParent().validate();
                        
                        FormEditor editor = getPage().getEditor();
                        if (editor instanceof LocalizationDataEditor) {
                            ((LocalizationDataEditor) editor).displayLocaleKeysConflict(localeEntry.getLocales());
                        }
                    }
                }
            }




 * 
 * Contributors:
 *     Diego Sandin (Motorola) - Initial Version
 *     David Marques (Motorola) - Synchronizing locale states with outline.
 */
package org.eclipse.mtj.internal.ui.editors.l10n.details;


                        locale
                                .setCountryCode(localeCountryCodeEntry
                                        .getValue());
                        locale.validate();
                    }
                }
            }

                            {
                                locale.setLanguageCode(localeLanguageCodeEntry
                                        .getValue());
                                locale.validate();
                            }
                        }
                    }




import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.mtj.core.internal.MTJCorePlugin;
import org.eclipse.mtj.internal.core.l10n.L10nApi;

import org.eclipse.mtj.internal.core.text.IDocumentAttributeNode;
import org.eclipse.mtj.internal.core.text.IDocumentElementNode;
import org.eclipse.mtj.internal.core.text.IDocumentRange;
import org.eclipse.mtj.internal.core.text.IEditingModel;
import org.eclipse.mtj.internal.core.text.l10n.L10nLocales;
import org.eclipse.mtj.internal.core.text.l10n.L10nModel;
import org.eclipse.mtj.internal.ui.MTJUIMessages;
import org.eclipse.mtj.internal.ui.editor.ISortableContentOutlinePage;
import org.eclipse.mtj.internal.ui.editor.MTJFormEditor;
import org.eclipse.mtj.internal.ui.editor.SourceOutlinePage;
import org.eclipse.mtj.internal.ui.editor.XMLSourcePage;
import org.eclipse.mtj.internal.ui.editors.l10n.L10nSourceOutlinePage;
import org.eclipse.mtj.ui.internal.MTJUIPlugin;

/**

    }

    /* (non-Javadoc)
     * @see org.eclipse.mtj.internal.ui.editor.MTJSourcePage#createOutlinePage()
     */
    protected ISortableContentOutlinePage createOutlinePage() {
        SourceOutlinePage sourceOutlinePage = new L10nSourceOutlinePage(
                (MTJFormEditor) getEditor(), (IEditingModel) getInputContext()
                        .getModel(), createOutlineLabelProvider(),
                createOutlineContentProvider(),
                createDefaultOutlineComparator(), createOutlineComparator());

        fOutlinePage = sourceOutlinePage;
        fOutlineSelectionChangedListener = new ISelectionChangedListener() {
            public void selectionChanged(SelectionChangedEvent event) {
                updateSelection(event);
            }
        };
        fOutlinePage
                .addSelectionChangedListener(fOutlineSelectionChangedListener);
        getSelectionProvider().addSelectionChangedListener(sourceOutlinePage);
        fEditorSelectionChangedListener = new MTJSourcePageChangedListener();
        fEditorSelectionChangedListener.install(getSelectionProvider());
        return fOutlinePage;
    }
    
    /* (non-Javadoc)
     * @see org.eclipse.mtj.internal.ui.editor.MTJSourcePage#createOutlineComparator()
     */
    @Override

            MTJCorePlugin.log(IStatus.ERROR, e);
        }
    }

}




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Diego Sandin (Motorola)  - Initial Version
 *     David Marques (Motorola) - Synchronizing key states with outline. 
 */
package org.eclipse.mtj.internal.ui.editors.l10n;


import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.actions.ContributionItemFactory;
import org.eclipse.ui.dialogs.PatternFilter;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
import org.eclipse.ui.keys.IBindingService;

     * 
     * @param event the update event
     */
    private void handleModelChangeType(final IModelChangedEvent event) {
        
        localesTree.getControl().getDisplay().asyncExec(new Runnable() {
            public void run() {
                if (localesTree.getControl().isDisposed()) {
                    return;
                }                
                
                // Get the changed object
                Object[] objects = event.getChangedObjects();
                L10nObject object = (L10nObject) objects[0];
                
                if (object != null) { // Update the element in the tree viewer
                    localesTree.update(object, null);
                    localesTree.refresh();
                }
            }
        });
    }

    /**


        // Create the adapted listener for the filter entry field
        filteredTree.createUIListenerEntryFilter(this);
        
        L10nLocales locales = model.getLocales();
        locales.validate();
        
        FormEditor editor = getPage().getEditor();
        if (editor instanceof LocalizationDataEditor) {
            ((LocalizationDataEditor) editor).displayLocaleKeysConflict(locales);
        }
    }

    /* (non-Javadoc)




 * Contributors:
 *     Diego Sandin (Motorola) - Initial Version
 *     David Marques (Motorola) - Overriding doSave method.
 *     David Marques (Motorola) - Synchronizing key states with outline. 
 */
package org.eclipse.mtj.internal.ui.editors.l10n;



import java.io.File;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.mtj.core.internal.MTJCorePlugin;

import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.mtj.core.internal.MTJCorePlugin;
import org.eclipse.mtj.internal.core.l10n.L10nApi;
import org.eclipse.mtj.internal.core.text.l10n.L10nLocale;
import org.eclipse.mtj.internal.core.text.l10n.L10nLocales;
import org.eclipse.mtj.internal.core.text.l10n.L10nModel;
import org.eclipse.mtj.internal.core.text.l10n.L10nObject;
import org.eclipse.mtj.internal.ui.editor.ISortableContentOutlinePage;

import org.eclipse.mtj.internal.ui.editors.l10n.pages.L10nSourcePage;
import org.eclipse.mtj.internal.ui.editors.l10n.pages.LocalizationPage;
import org.eclipse.mtj.ui.IMTJUIConstants;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IStorageEditorInput;

import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IStorageEditorInput;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.forms.IMessageManager;
import org.eclipse.ui.forms.editor.IFormPage;

/**


    }

    @Override
    protected void pageChange(int newPageIndex) {
        super.pageChange(newPageIndex);
        IFormPage page = getActivePageInstance();
        if (page instanceof LocalizationPage) {
            L10nModel model = (L10nModel) inputContextManager.findContext(L10nInputContext.CONTEXT_ID).getModel();
            if (model != null) {                
                displayLocaleKeysConflict(model.getLocales());
            }
        }
    }
    
    /* (non-Javadoc)
     * @see org.eclipse.mtj.internal.ui.editor.MTJFormEditor#getSelection()
     */

    protected InputContext getInputContext(Object object) {
        return inputContextManager.findContext(L10nInputContext.CONTEXT_ID);
    }
    
    /**
     * Displays conflicting locales message.
     * 
     * @param locales locales.
     */
    public void displayLocaleKeysConflict(L10nLocales locales) {
        List<L10nLocale> conflicted = L10nUtil.findConflictedLocales(locales);
        IMessageManager  manager = getActivePageInstance().getManagedForm().getMessageManager();
        manager.removeAllMessages();
        for (L10nLocale locale : conflicted) {
            String message = NLS.bind("Locale keys are case insensitive. The locale {0} has duplicated keys.", locale.getName());
            manager.addMessage(locale, message, null, IMessageProvider.ERROR);
        }
    }
}




package org.eclipse.mtj.internal.ui.editors.l10n;

import java.util.LinkedList;
import java.util.List;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.mtj.internal.core.text.IDocumentElementNode;
import org.eclipse.mtj.internal.core.text.l10n.L10nEntry;
import org.eclipse.mtj.internal.core.text.l10n.L10nLocale;
import org.eclipse.mtj.internal.core.text.l10n.L10nLocales;

/**
 * Copyright (c) 2008 Motorola.
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     David Marques (Motorola) - Initial Version 
 */
public class L10nUtil {

    /**
     * This method finds all conflicting locales.
     * 
     * @param locales target locales instance.
     * @return the list of all conflicting locales.
     */
    public static List<L10nLocale> findConflictedLocales(L10nLocales locales) {
        List<L10nLocale> conflicted = new LinkedList<L10nLocale>();
        IDocumentElementNode[] localeNodes = locales.getChildNodes();
        for (IDocumentElementNode localeNode : localeNodes) {
            L10nLocale locale = (L10nLocale) localeNode;
            if (localeHasKeyConflicts(locale)) {
                conflicted.add(locale);
            }
        }
        return conflicted;
    }

    /**
     * Checks whether the specified locale has conflicting keys.
     * 
     * @param locale target locale instance.
     * @return true if there are conslicts false otherwise.
     */
    private static boolean localeHasKeyConflicts(L10nLocale locale) {
        IDocumentElementNode nodes[] = locale.getChildNodes();
        for (IDocumentElementNode node : nodes) {
            L10nEntry entry = (L10nEntry) node;
            if (entry.getStatus().getSeverity() == IStatus.ERROR) {
                return true;
            }
        }
        return false;
    }

}




/**
 * Copyright (c) 2008 Motorola.
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     David Marques (Motorola) - Initial Version 
 */
package org.eclipse.mtj.internal.ui.editors.l10n;

import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.mtj.internal.core.text.IEditingModel;
import org.eclipse.mtj.internal.core.text.l10n.L10nModel;
import org.eclipse.mtj.internal.ui.editor.MTJFormEditor;
import org.eclipse.mtj.internal.ui.editor.SourceOutlinePage;
import org.eclipse.swt.widgets.Control;

public class L10nSourceOutlinePage extends SourceOutlinePage {

    /**
     * Creates a new content outline page for the XML editor.
     * 
     * @param editor
     * @param model
     * @param lProvider
     * @param cProvider
     * @param defaultComparator
     * @param comparator
     */
    public L10nSourceOutlinePage(MTJFormEditor editor, IEditingModel model,
            IBaseLabelProvider provider, IContentProvider provider2,
            ViewerComparator defaultComparator, ViewerComparator comparator) {
        super(editor, model, provider, provider2, defaultComparator, comparator);
    }
    
    @Override
    public void reconciled(IDocument document) {
        
        final Control control = getControl();
        if ((control == null) || control.isDisposed()) {
            return;
        }
        
        control.getDisplay().asyncExec(new Runnable() {
            public void run() {
                if (control.isDisposed()) {
                    return;
                }                
                if (model instanceof L10nModel) {            
                    ((L10nModel) model).getLocales().validate();
                }
            }
        });
        super.reconciled(document);
    }

    /**
     * Validates the model.
     */
    public void refresh() {
        if (model instanceof L10nModel) {            
            ((L10nModel) model).getLocales().validate();
        }
    }
}

Lines 9-14 Link Here

(-)src/org/eclipse/mtj/internal/ui/editor/SourceOutlinePage.java (-1 / +2 lines)
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
11	* Diego Sandin (Motorola) - Adapted code from org.eclipse.pde.ui	11	* Diego Sandin (Motorola) - Adapted code from org.eclipse.pde.ui
		12	* David Marques (Motorola) - Changing several attributes access.
12	*/	13	*/
13	package org.eclipse.mtj.internal.ui.editor;	14	package org.eclipse.mtj.internal.ui.editor;
14		15
Lines 45-51 Link Here
45	* from our parent.	46	* from our parent.
46	*/	47	*/
47	private ArrayList<ISelectionChangedListener> listenerList;	48	private ArrayList<ISelectionChangedListener> listenerList;
48	private IEditingModel model;	49	protected IEditingModel model;
49	private boolean sorted;	50	private boolean sorted;
50	private ViewerComparator viewerComparator;	51	private ViewerComparator viewerComparator;
51	TreeViewer viewer;	52	TreeViewer viewer;

Lines 54-59 Link Here

(-)src/org/eclipse/mtj/internal/ui/editor/MTJFormEditor.java (+4 lines)
54	import org.eclipse.mtj.internal.ui.editor.context.IInputContextListener;	54	import org.eclipse.mtj.internal.ui.editor.context.IInputContextListener;
55	import org.eclipse.mtj.internal.ui.editor.context.InputContext;	55	import org.eclipse.mtj.internal.ui.editor.context.InputContext;
56	import org.eclipse.mtj.internal.ui.editor.context.InputContextManager;	56	import org.eclipse.mtj.internal.ui.editor.context.InputContextManager;
		57	import org.eclipse.mtj.internal.ui.editors.l10n.L10nSourceOutlinePage;
57	import org.eclipse.mtj.ui.IMTJUIConstants;	58	import org.eclipse.mtj.ui.IMTJUIConstants;
58	import org.eclipse.mtj.ui.internal.MTJUIPlugin;	59	import org.eclipse.mtj.ui.internal.MTJUIPlugin;
59	import org.eclipse.search.ui.text.ISearchEditorAccess;	60	import org.eclipse.search.ui.text.ISearchEditorAccess;
Lines 891-896 Link Here
891	ISortableContentOutlinePage outline = null;	892	ISortableContentOutlinePage outline = null;
892	if (page instanceof MTJSourcePage) {	893	if (page instanceof MTJSourcePage) {
893	outline = ((MTJSourcePage) page).getContentOutline();	894	outline = ((MTJSourcePage) page).getContentOutline();
		895	if ((outline != null) && (outline instanceof L10nSourceOutlinePage)) {
		896	((L10nSourceOutlinePage) outline).refresh();
		897	}
894	} else {	898	} else {
895	outline = getFormOutline();	899	outline = getFormOutline();
896	if ((outline != null) && (outline instanceof FormOutlinePage)) {	900	if ((outline != null) && (outline instanceof FormOutlinePage)) {




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation          - initial API and implementation
 *     Diego Sandin (Motorola)  - Adapted code from org.eclipse.pde.ui/PDESourcePage
 *     David Marques (Motorola) - Changing several attributes access.
 */
package org.eclipse.mtj.internal.ui.editor;


     * 
     * @since 0.9.1
     */
    public class MTJSourcePageChangedListener implements
            ISelectionChangedListener {

        /**

    /**
     * The editor selection changed listener.
     */
    protected MTJSourcePageChangedListener fEditorSelectionChangedListener;
    private String fId;
    private int fIndex;
    private InputContext fInputContext;
    protected ISortableContentOutlinePage fOutlinePage;
    private Object fSelection;
    protected ISelectionChangedListener fOutlineSelectionChangedListener;

    /**
     * @param editor

Return to bug 257362

Lines 11-17 Link Here

(-)src/org/eclipse/mtj/internal/core/l10n/L10nBuilder.java (-2 / +3 lines)
11	* David Marques (Motorola) - Using L10n Models.	11	* David Marques (Motorola) - Using L10n Models.
12	* David Marques (Motorola) - Fixing cleaning.	12	* David Marques (Motorola) - Fixing cleaning.
13	* David Marques (Motorola) - Removing all .properties from project	13	* David Marques (Motorola) - Removing all .properties from project
14	* upon cleaning project.	14	* upon cleaning project.
		15	* David Marques (Motorola) - Generating keys on upper case.
15	*/	16	*/
16	package org.eclipse.mtj.internal.core.l10n;	17	package org.eclipse.mtj.internal.core.l10n;
17		18
Lines 251-257 Link Here
251	IDocumentElementNode[] nodes = locale.getChildNodes();	252	IDocumentElementNode[] nodes = locale.getChildNodes();
252	for (int i = 0; i < nodes.length; i++) {	253	for (int i = 0; i < nodes.length; i++) {
253	L10nEntry entry = (L10nEntry) nodes[i];	254	L10nEntry entry = (L10nEntry) nodes[i];
254	buffer.append(entry.getKey());	255	buffer.append(entry.getKey().toUpperCase());
255	buffer.append("="); //$NON-NLS-1$	256	buffer.append("="); //$NON-NLS-1$
256	buffer.append(entry.getValue());	257	buffer.append(entry.getValue());
257	buffer.append("\n"); //$NON-NLS-1$	258	buffer.append("\n"); //$NON-NLS-1$

Lines 11-16 Link Here

(-)src/org/eclipse/mtj/internal/core/l10n/L10nApi.java (-3 / +4 lines)
11	* David Marques (Motorola) - Fixing propeties folder path	11	* David Marques (Motorola) - Fixing propeties folder path
12	* David Marques (Motorola) - Removing old classes from L10n API	12	* David Marques (Motorola) - Removing old classes from L10n API
13	* upon API creation.	13	* upon API creation.
		14	* David Marques (Motorola) - Generating keys on upper case.
14	*/	15	*/
15	package org.eclipse.mtj.internal.core.l10n;	16	package org.eclipse.mtj.internal.core.l10n;
16		17
Lines 128-135 Link Here
128	IDocumentElementNode[] entryNodes = locale.getChildNodes();	129	IDocumentElementNode[] entryNodes = locale.getChildNodes();
129	for (int i = 0; i < entryNodes.length; i++) {	130	for (int i = 0; i < entryNodes.length; i++) {
130	L10nEntry entry = (L10nEntry) entryNodes[i];	131	L10nEntry entry = (L10nEntry) entryNodes[i];
131	if (!keys.contains(entry.getKey())) {	132	if (!keys.contains(entry.getKey().toUpperCase())) {
132	keys.add(entry.getKey());	133	keys.add(entry.getKey().toUpperCase());
133	}	134	}
134	}	135	}
135	}	136	}
Lines 229-235 Link Here
229	private static String writeStringConstantDeclaration(String name,	230	private static String writeStringConstantDeclaration(String name,
230	String value) {	231	String value) {
231	return NLS.bind("\t\tpublic static final String {0} = \"{1}\";\n",	232	return NLS.bind("\t\tpublic static final String {0} = \"{1}\";\n",
232	new String[] { name.replace("-", "_"), value });	233	new String[] { name.replace("-", "_"), value});
233	}	234	}
234		235
235	/**	236	/**

Lines 16-22 Link Here

(-)src/org/eclipse/mtj/internal/ui/editors/l10n/pages/L10nSourcePage.java (-1 / +30 lines)
16	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
17	import org.eclipse.core.runtime.IStatus;	17	import org.eclipse.core.runtime.IStatus;
18	import org.eclipse.jface.viewers.ILabelProvider;	18	import org.eclipse.jface.viewers.ILabelProvider;
		19	import org.eclipse.jface.viewers.ISelectionChangedListener;
19	import org.eclipse.jface.viewers.ITreeContentProvider;	20	import org.eclipse.jface.viewers.ITreeContentProvider;
		21	import org.eclipse.jface.viewers.SelectionChangedEvent;
20	import org.eclipse.jface.viewers.ViewerComparator;	22	import org.eclipse.jface.viewers.ViewerComparator;
21	import org.eclipse.mtj.core.internal.MTJCorePlugin;	23	import org.eclipse.mtj.core.internal.MTJCorePlugin;
22	import org.eclipse.mtj.internal.core.l10n.L10nApi;	24	import org.eclipse.mtj.internal.core.l10n.L10nApi;
Lines 23-33 Link Here
23	import org.eclipse.mtj.internal.core.text.IDocumentAttributeNode;	25	import org.eclipse.mtj.internal.core.text.IDocumentAttributeNode;
24	import org.eclipse.mtj.internal.core.text.IDocumentElementNode;	26	import org.eclipse.mtj.internal.core.text.IDocumentElementNode;
25	import org.eclipse.mtj.internal.core.text.IDocumentRange;	27	import org.eclipse.mtj.internal.core.text.IDocumentRange;
		28	import org.eclipse.mtj.internal.core.text.IEditingModel;
26	import org.eclipse.mtj.internal.core.text.l10n.L10nLocales;	29	import org.eclipse.mtj.internal.core.text.l10n.L10nLocales;
27	import org.eclipse.mtj.internal.core.text.l10n.L10nModel;	30	import org.eclipse.mtj.internal.core.text.l10n.L10nModel;
28	import org.eclipse.mtj.internal.ui.MTJUIMessages;	31	import org.eclipse.mtj.internal.ui.MTJUIMessages;
		32	import org.eclipse.mtj.internal.ui.editor.ISortableContentOutlinePage;
29	import org.eclipse.mtj.internal.ui.editor.MTJFormEditor;	33	import org.eclipse.mtj.internal.ui.editor.MTJFormEditor;
		34	import org.eclipse.mtj.internal.ui.editor.SourceOutlinePage;
30	import org.eclipse.mtj.internal.ui.editor.XMLSourcePage;	35	import org.eclipse.mtj.internal.ui.editor.XMLSourcePage;
		36	import org.eclipse.mtj.internal.ui.editors.l10n.L10nSourceOutlinePage;
31	import org.eclipse.mtj.ui.internal.MTJUIPlugin;	37	import org.eclipse.mtj.ui.internal.MTJUIPlugin;
32		38
33	/**	39	/**
Lines 45-50 Link Here
45	}	51	}
46		52
47	/* (non-Javadoc)	53	/* (non-Javadoc)
		54	* @see org.eclipse.mtj.internal.ui.editor.MTJSourcePage#createOutlinePage()
		55	*/
		56	protected ISortableContentOutlinePage createOutlinePage() {
		57	SourceOutlinePage sourceOutlinePage = new L10nSourceOutlinePage(
		58	(MTJFormEditor) getEditor(), (IEditingModel) getInputContext()
		59	.getModel(), createOutlineLabelProvider(),
		60	createOutlineContentProvider(),
		61	createDefaultOutlineComparator(), createOutlineComparator());
		62
		63	fOutlinePage = sourceOutlinePage;
		64	fOutlineSelectionChangedListener = new ISelectionChangedListener() {
		65	public void selectionChanged(SelectionChangedEvent event) {
		66	updateSelection(event);
		67	}
		68	};
		69	fOutlinePage
		70	.addSelectionChangedListener(fOutlineSelectionChangedListener);
		71	getSelectionProvider().addSelectionChangedListener(sourceOutlinePage);
		72	fEditorSelectionChangedListener = new MTJSourcePageChangedListener();
		73	fEditorSelectionChangedListener.install(getSelectionProvider());
		74	return fOutlinePage;
		75	}
		76
		77	/* (non-Javadoc)
48	* @see org.eclipse.mtj.internal.ui.editor.MTJSourcePage#createOutlineComparator()	78	* @see org.eclipse.mtj.internal.ui.editor.MTJSourcePage#createOutlineComparator()
49	*/	79	*/
50	@Override	80	@Override
Lines 167-171 Link Here
167	MTJCorePlugin.log(IStatus.ERROR, e);	197	MTJCorePlugin.log(IStatus.ERROR, e);
168	}	198	}
169	}	199	}
170
171	}	200	}

Line 0 Link Here

(-)src/org/eclipse/mtj/internal/ui/editors/l10n/L10nSourceOutlinePage.java (+71 lines)
		1	/**
		2	* Copyright (c) 2008 Motorola.
		3	*
		4	* All rights reserved. This program and the accompanying materials
		5	* are made available under the terms of the Eclipse Public License v1.0
		6	* which accompanies this distribution, and is available at
		7	* http://www.eclipse.org/legal/epl-v10.html
		8	*
		9	* Contributors:
		10	* David Marques (Motorola) - Initial Version
		11	*/
		12	package org.eclipse.mtj.internal.ui.editors.l10n;
		13
		14	import org.eclipse.jface.text.IDocument;
		15	import org.eclipse.jface.viewers.IBaseLabelProvider;
		16	import org.eclipse.jface.viewers.IContentProvider;
		17	import org.eclipse.jface.viewers.ViewerComparator;
		18	import org.eclipse.mtj.internal.core.text.IEditingModel;
		19	import org.eclipse.mtj.internal.core.text.l10n.L10nModel;
		20	import org.eclipse.mtj.internal.ui.editor.MTJFormEditor;
		21	import org.eclipse.mtj.internal.ui.editor.SourceOutlinePage;
		22	import org.eclipse.swt.widgets.Control;
		23
		24	public class L10nSourceOutlinePage extends SourceOutlinePage {
		25
		26	/**
		27	* Creates a new content outline page for the XML editor.
		28	*
		29	* @param editor
		30	* @param model
		31	* @param lProvider
		32	* @param cProvider
		33	* @param defaultComparator
		34	* @param comparator
		35	*/
		36	public L10nSourceOutlinePage(MTJFormEditor editor, IEditingModel model,
		37	IBaseLabelProvider provider, IContentProvider provider2,
		38	ViewerComparator defaultComparator, ViewerComparator comparator) {
		39	super(editor, model, provider, provider2, defaultComparator, comparator);
		40	}
		41
		42	@Override
		43	public void reconciled(IDocument document) {
		44
		45	final Control control = getControl();
		46	if ((control == null) \|\| control.isDisposed()) {
		47	return;
		48	}
		49
		50	control.getDisplay().asyncExec(new Runnable() {
		51	public void run() {
		52	if (control.isDisposed()) {
		53	return;
		54	}
		55	if (model instanceof L10nModel) {
		56	((L10nModel) model).getLocales().validate();
		57	}
		58	}
		59	});
		60	super.reconciled(document);
		61	}
		62
		63	/**
		64	* Validates the model.
65	*/
66	public void refresh() {
67	if (model instanceof L10nModel) {
68	((L10nModel) model).getLocales().validate();
69	}
70	}
71	}