Attachment #76070 for bug #48263

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 48263
Collapse All | Expand All

Lines 1-6 Link Here

(-)a/properties/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.properties/1	2	OpenIDE-Module: org.netbeans.modules.properties/1
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/properties/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/properties/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.26	4	OpenIDE-Module-Specification-Version: 1.27
5	OpenIDE-Module-Layer: org/netbeans/modules/properties/Layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/properties/Layer.xml
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false

Lines 73-80 Link Here

(-)a/properties/src/org/netbeans/modules/properties/BundleEditPanel.java (-27 / +123 lines)
73	public class BundleEditPanel extends JPanel implements PropertyChangeListener {	73	public class BundleEditPanel extends JPanel implements PropertyChangeListener {
74		74
75	/** PropertiesDataObject this panel presents. */	75	/** PropertiesDataObject this panel presents. */
76	private PropertiesDataObject obj;	76	// private PropertiesDataObject obj;
77		77
		78	/** */
		79	private BundleStructure structure;
		80
78	/** Document listener for value and comment textareas. */	81	/** Document listener for value and comment textareas. */
79	private DocumentListener listener;	82	private DocumentListener listener;
80		83
Lines 88-95 Link Here
88	private int lastSelectedColumn;	91	private int lastSelectedColumn;
89		92
90	/** Creates new form BundleEditPanel */	93	/** Creates new form BundleEditPanel */
		94	@Deprecated
91	public BundleEditPanel(final PropertiesDataObject obj, PropertiesTableModel propTableModel) {	95	public BundleEditPanel(final PropertiesDataObject obj, PropertiesTableModel propTableModel) {
92	this.obj = obj;	96	// this.obj = obj;
		97	this.structure = obj.getBundleStructure();
93		98
94	initComponents();	99	initComponents();
95	initAccessibility();	100	initAccessibility();
Lines 153-159 Link Here
153	obj.getBundleStructure().sort(modelIndex);	158	obj.getBundleStructure().sort(modelIndex);
154	}	159	}
155	});	160	});
156		161
157		162
158	table.getSelectionModel().addListSelectionListener(new ListSelectionListener() {	163	table.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
159	public void valueChanged(ListSelectionEvent evt) {	164	public void valueChanged(ListSelectionEvent evt) {
Lines 168-173 Link Here
168		173
169	} // End of constructor.	174	} // End of constructor.
170		175
		176	/** Creates new form BundleEditPanel */
		177	public BundleEditPanel(final BundleStructure structure, PropertiesTableModel propTableModel) {
		178	this.structure = structure;
		179
		180	initComponents();
		181	initAccessibility();
		182	initSettings();
		183
		184	// Sets table column model.
		185	table.setColumnModel(new TableViewColumnModel());
		186
		187	// Sets custom table header renderer (with sorting indicators).
		188	JTableHeader header = table.getTableHeader();
		189	header.setDefaultRenderer(
		190	new TableViewHeaderRenderer(structure, header.getDefaultRenderer()));
		191
		192	// Sets table model.
		193	table.setModel(propTableModel);
		194
		195	// Sets table cell editor.
		196	JTextField textField = new JTextField();
		197	// Force the document to accept newlines. The textField doesn't like
		198	// it, but the same document is used by the <code>textValue</code> text
		199	// area that must accept newlines.
		200	textField.getDocument().putProperty("filterNewlines", Boolean.FALSE); // NOI18N
		201	textField.setBorder(new LineBorder(Color.black));
		202	textField.getAccessibleContext().setAccessibleName(NbBundle.getBundle(BundleEditPanel.class).getString("ACSN_CellEditor"));
		203	textField.getAccessibleContext().setAccessibleDescription(NbBundle.getBundle(BundleEditPanel.class).getString("ACSD_CellEditor"));
		204	listener = new ModifiedListener();
		205	table.setDefaultEditor(PropertiesTableModel.StringPair.class,
		206	new PropertiesTableCellEditor(textField, textComment, textValue, valueLabel, listener));
		207
		208	// Sets renderer.
		209	table.setDefaultRenderer(PropertiesTableModel.StringPair.class, new TableViewRenderer());
		210
		211	updateAddButton();
		212
		213	// property change listener - listens to editing state of the table
		214	table.addPropertyChangeListener(new PropertyChangeListener() {
		215	public void propertyChange(PropertyChangeEvent evt) {
		216	if (evt.getPropertyName().equals("tableCellEditor")) { // NOI18N
		217	updateEnabled();
		218	} else if (evt.getPropertyName().equals("model")) { // NOI18N
		219	updateAddButton();
		220	}
		221	}
		222	});
		223
		224	// listens on clikcs on table header, detects column and sort accordingly to chosen one
		225	table.getTableHeader().addMouseListener(new MouseAdapter() {
		226	@Override
		227	public void mouseClicked(MouseEvent e) {
		228	TableColumnModel colModel = table.getColumnModel();
		229	int columnModelIndex = colModel.getColumnIndexAtX(e.getX());
		230	// No column was clicked.
		231	if (columnModelIndex < 0) {
		232	return;
		233	}
		234	int modelIndex = colModel.getColumn(columnModelIndex).getModelIndex();
		235	// not detected column
		236	if (modelIndex < 0) {
		237	return;
		238	}
		239	structure.sort(modelIndex);
240	}
241	});
242
243	ListSelectionListener listSelectionListener = new ListSelectionListener() {
244
245	public void valueChanged(ListSelectionEvent evt) {
246	final boolean correctCellSelection = !selectionUpdateDisabled;
247	SwingUtilities.invokeLater(new Runnable() {
248	public void run() {
249	updateSelection(correctCellSelection);
250	}
251	});
252	}
253	};
254
255	table.getColumnModel().getSelectionModel().addListSelectionListener(listSelectionListener);
256	table.getSelectionModel().addListSelectionListener(listSelectionListener);
257
258	} // End of constructor.
171		259
172	/** Stops editing if editing is in run. */	260	/** Stops editing if editing is in run. */
173	protected void stopEditing() {	261	protected void stopEditing() {
Lines 229-235 Link Here
229	if (ex == null) {	317	if (ex == null) {
230	return;	318	return;
231	}	319	}
232	String [] keys = obj.getBundleStructure().getKeys();	320	String [] keys = structure.getKeys();
233	int idx;	321	int idx;
234	for (idx = 0; idx < keys.length; idx++) {	322	for (idx = 0; idx < keys.length; idx++) {
235	String key = keys[idx];	323	String key = keys[idx];
Lines 248-254 Link Here
248	}	336	}
249		337
250	lastSelectedColumn = column;	338	lastSelectedColumn = column;
251	BundleStructure structure = obj.getBundleStructure();	339	// BundleStructure structure = obj.getBundleStructure();
252	removeButton.setEnabled((row >= 0) && (!structure.isReadOnly()));	340	removeButton.setEnabled((row >= 0) && (!structure.isReadOnly()));
253	String value;	341	String value;
254	String comment;	342	String comment;
Lines 281-294 Link Here
281	}	369	}
282		370
283	private void updateAddButton() {	371	private void updateAddButton() {
284	addButton.setEnabled(!obj.getBundleStructure().isReadOnly());	372	addButton.setEnabled(!structure.isReadOnly());
285	}	373	}
286		374
287	/** Returns the main table with all values */	375	/** Returns the main table with all values */
288	public JTable getTable() {	376	public JTable getTable() {
289	return table;	377	return table;
290	}	378	}
291
292		379
293	/** Initializes <code>settings</code> variable. */	380	/** Initializes <code>settings</code> variable. */
294	private void initSettings() {	381	private void initSettings() {
Lines 511-520 Link Here
511	if (DialogDisplayer.getDefault().notify(msg).equals(NotifyDescriptor.OK_OPTION)) {	598	if (DialogDisplayer.getDefault().notify(msg).equals(NotifyDescriptor.OK_OPTION)) {
512	try {	599	try {
513	// Starts "atomic" acion for special undo redo manager of open support.	600	// Starts "atomic" acion for special undo redo manager of open support.
514	obj.getOpenSupport().atomicUndoRedoFlag = new Object();	601	// obj.getOpenSupport().atomicUndoRedoFlag = new Object();
		602	structure.getOpenSupport().atomicUndoRedoFlag = new Object();
515		603
516	for (int i=0; i < obj.getBundleStructure().getEntryCount(); i++) {	604	for (int i=0; i < structure.getEntryCount(); i++) {
517	PropertiesFileEntry entry = obj.getBundleStructure().getNthEntry(i);	605	PropertiesFileEntry entry = structure.getNthEntry(i);
518	if (entry != null) {	606	if (entry != null) {
519	PropertiesStructure ps = entry.getHandler().getStructure();	607	PropertiesStructure ps = entry.getHandler().getStructure();
520	if (ps != null) {	608	if (ps != null) {
Lines 524-530 Link Here
524	}	612	}
525	} finally {	613	} finally {
526	// finishes "atomic" undo redo action for special undo redo manager of open support	614	// finishes "atomic" undo redo action for special undo redo manager of open support
527	obj.getOpenSupport().atomicUndoRedoFlag = null;	615	// obj.getOpenSupport().atomicUndoRedoFlag = null;
		616	structure.getOpenSupport().atomicUndoRedoFlag = null;
528	}	617	}
529	}	618	}
530	}//GEN-LAST:event_removeButtonActionPerformed	619	}//GEN-LAST:event_removeButtonActionPerformed
Lines 563-576 Link Here
563	selectionUpdateDisabled = true;	652	selectionUpdateDisabled = true;
564		653
565	// Starts "atomic" acion for special undo redo manager of open support.	654	// Starts "atomic" acion for special undo redo manager of open support.
566	obj.getOpenSupport().atomicUndoRedoFlag = new Object();	655	// obj.getOpenSupport().atomicUndoRedoFlag = new Object();
567		656	structure.getOpenSupport().atomicUndoRedoFlag = new Object();
568	String existingLocales = "";	657	String existingLocales = "";
569	String comma = ",\r\n"; //NOI18N	658	String comma =",\r\n";
570	int count = obj.getBundleStructure().getEntryCount();
571	// add key to all entries	659	// add key to all entries
572	for (int i=0; i < count; i++) {	660	for (int i=0; i < structure.getEntryCount(); i++) {
573	PropertiesFileEntry entry = obj.getBundleStructure().getNthEntry(i);	661	PropertiesFileEntry entry = structure.getNthEntry(i);
574		662
575	if (entry != null && !entry.getHandler().getStructure().addItem(key, value, comment)) {	663	if (entry != null && !entry.getHandler().getStructure().addItem(key, value, comment)) {
576	existingLocales += Util.getLocaleLabel(entry) + comma;	664	existingLocales += Util.getLocaleLabel(entry) + comma;
Lines 591-600 Link Here
591	NotifyDescriptor.ERROR_MESSAGE);	679	NotifyDescriptor.ERROR_MESSAGE);
592	DialogDisplayer.getDefault().notify(msg);	680	DialogDisplayer.getDefault().notify(msg);
593	}	681	}
594
595	} finally {	682	} finally {
596	// Finishes "atomic" undo redo action for special undo redo manager of open support.	683	// Finishes "atomic" undo redo action for special undo redo manager of open support.
597	obj.getOpenSupport().atomicUndoRedoFlag = null;	684	// obj.getOpenSupport().atomicUndoRedoFlag = null;
		685	structure.getOpenSupport().atomicUndoRedoFlag = null;
598		686
599	selectionUpdateDisabled = false;	687	selectionUpdateDisabled = false;
600	}	688	}
Lines 608-614 Link Here
608	PropertiesRequestProcessor.getInstance().post(new Runnable() {	696	PropertiesRequestProcessor.getInstance().post(new Runnable() {
609	public void run() {	697	public void run() {
610	// Find indexes.	698	// Find indexes.
611	int rowIndex = obj.getBundleStructure().getKeyIndexByName(key);	699	int rowIndex = structure.getKeyIndexByName(key);
612		700
613	if((rowIndex != -1)) {	701	if((rowIndex != -1)) {
614	final int row = rowIndex;	702	final int row = rowIndex;
Lines 677-689 Link Here
677	private static final String SORT_ASC_ICON = ICON_PKG + "columnSortedAsc.gif"; //NOI18N	765	private static final String SORT_ASC_ICON = ICON_PKG + "columnSortedAsc.gif"; //NOI18N
678	private static final String SORT_DESC_ICON = ICON_PKG + "columnSortedDesc.gif"; //NOI18N	766	private static final String SORT_DESC_ICON = ICON_PKG + "columnSortedDesc.gif"; //NOI18N
679		767
680	private final PropertiesDataObject propDataObj;	768	private final BundleStructure bundleStructure;
681	private final TableCellRenderer origRenderer;	769	private final TableCellRenderer origRenderer;
682	private ImageIcon iconSortAsc, iconSortDesc;	770	private ImageIcon iconSortAsc, iconSortDesc;
683		771
		772	@Deprecated
684	TableViewHeaderRenderer(PropertiesDataObject propDataObj,	773	TableViewHeaderRenderer(PropertiesDataObject propDataObj,
685	TableCellRenderer origRenderer) {	774	TableCellRenderer origRenderer) {
686	this.propDataObj = propDataObj;	775	bundleStructure = propDataObj.getBundleStructure();
		776	this.origRenderer = origRenderer;
		777	}
		778
		779	TableViewHeaderRenderer(BundleStructure bundleStructure,
		780	TableCellRenderer origRenderer) {
		781	this.bundleStructure = bundleStructure;
687	this.origRenderer = origRenderer;	782	this.origRenderer = origRenderer;
688	}	783	}
689		784
Lines 698-704 Link Here
698		793
699	if (comp instanceof JLabel) {	794	if (comp instanceof JLabel) {
700	JLabel label = (JLabel) comp;	795	JLabel label = (JLabel) comp;
701	BundleStructure bundleStruct = propDataObj.getBundleStructure();	796	BundleStructure bundleStruct = bundleStructure;
702	int sortIndex = table.convertColumnIndexToView(	797	int sortIndex = table.convertColumnIndexToView(
703	bundleStruct.getSortIndex());	798	bundleStruct.getSortIndex());
704	if (column == sortIndex) {	799	if (column == sortIndex) {
Lines 1003-1011 Link Here
1003	}	1098	}
1004		1099
1005	private void documentModified() {	1100	private void documentModified() {
1006	obj.setModified(true);	1101	((PropertiesTableModel)table.getModel()).getFileEntry(table.getEditingColumn()).getDataObject().setModified(true);
		1102	// obj.setModified(true);
1007	}	1103	}
1008		1104
1009	}	1105	}
1010		1106
1011	}	1107	}





import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.Serializable;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;

import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
import org.openide.filesystems.FileObject;
import org.openide.loaders.MultiDataObject.Entry;
import org.openide.util.WeakListeners;


 * @author Petr Jiricka
 */
public class BundleStructure {

    /**
     * <code>PropertiesDataObject</code> whose structure is described
     * by this object


    /** listens to changes on the underlying <code>PropertyDataObject</code> */
    private PropertyChangeListener propListener;

    protected BundleStructure() {
        obj = null;
    }
    /**
     * Creates a new instance describing a given
     * <code>PropertiesDataObject</code>.

        return comparator.isAscending();
    }

    PropertiesOpen getOpenSupport() {
        throw new UnsupportedOperationException("Not yet implemented");
    }

    /**
     * Builds (or rebuilds) a sorted list of entries of the underlying
     * <code>PropertiesDataObject<code> and a sorted list of keys gathered

     * @see  #entries
     * @see  #keyList
     */
    void updateEntries() {
        Map<String,PropertiesFileEntry> tm = new TreeMap<String,PropertiesFileEntry>(
                PropertiesDataObject.getSecondaryFilesComparator());
        for (Entry entry : obj.secondaryEntries()) {

     *
     * @see  #keyList
     */
    protected synchronized void buildKeySet() {
        List<String> keyList = new ArrayList<String>() {
            public boolean equals(Object obj) {
                if (!(obj instanceof ArrayList)) {

        int entriesCount = getEntryCount();
        for (int index = 0; index < entriesCount; index++) {
            PropertiesFileEntry entry = getNthEntry(index);
            if (entry != null) {
                PropertiesStructure ps = entry.getHandler().getStructure();
                if (ps != null) {
                    for (Iterator<Element.ItemElem> it = ps.allItems(); it.hasNext(); ) {
                        Element.ItemElem item = it.next();
                        if (item == null) {
                            continue;
                        }
                        String key = item.getKey();
                        if (key != null && !(keyList.contains(key))) {
                            keyList.add(item.getKey());
                        }
                    }
                }
            }

     * @see  #removePropertyBundleListener
     */
    public void addPropertyBundleListener(PropertyBundleListener l) {
        if (propBundleSupport == null) propBundleSupport = new PropertyBundleSupport(this);
        propBundleSupport.addPropertyBundleListener(l);
    }


        );
    }

    void notifyOneFileChanged(FileObject file) {
        // PENDING - events should be finer
        // find out whether global key table has changed and fire a change
        // according to that
        List oldKeyList = keyList;

        buildKeySet();
        if (!keyList.equals(oldKeyList)) {
            propBundleSupport.fireBundleDataChanged();
        } else {
            propBundleSupport.fireFileChanged(file.getName());
        }
    }
    /**
     * Notifies registered listeners of a change in a single file entry.
     * Depending whether a list of keys has changed, either an event




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */
package org.netbeans.modules.properties;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.util.Exceptions;

/**
 *
 * @author alexeybutenko
 */
class MultiBundleStructure extends BundleStructure implements Serializable {

    private transient FileObject[] files;
    private transient PropertiesFileEntry primaryEntry;
    private String baseName;

    /** Generated Serialized Version UID. */
    static final long serialVersionUID = 7501232754255253334L;

    private transient PropertiesOpen openSupport;
    /** Lock used for synchronization of <code>openSupport</code> instance creation */
    private final transient Object OPEN_SUPPORT_LOCK = new Object();


    protected MultiBundleStructure() {
//        super();
//        files = null;
//        primaryEntry = null;
//        baseName = null;
    }

    public MultiBundleStructure(PropertiesDataObject obj) {
//        super(obj);
        this.obj = obj;
        baseName = Util.getBaseName(obj.getName());
    }

    /**
     * Find entries according to PropertiesDataObject
     *
     */
    private void findEntries() {
        try {
            if (obj == null) return;
            if (!obj.isValid()) {
                if (files.length == 1) {
                    primaryEntry = null;
                    obj = null;
                    files = null;
                    return;
                }
            } else {
                obj = Util.findPrimaryDataObject(obj);
                primaryEntry = (PropertiesFileEntry) obj.getPrimaryEntry();
            }
            FileObject primary = primaryEntry.getFile();
            FileObject parent = primary.getParent();
            List<FileObject> listFileObjects = new ArrayList<FileObject>();
            String fName;
            FileObject oldCandidate;
            for (FileObject file : parent.getChildren()) {
                fName = file.getName();
                if (fName.equals(baseName) && file.isValid()) {
                    listFileObjects.add(0,file);
                }
                if (fName.indexOf(baseName) != -1) {
                    int index = fName.indexOf(PropertiesDataLoader.PRB_SEPARATOR_CHAR);
                    if (index == baseName.length()) {
                        oldCandidate = null;
                        while (index != -1) {
                            FileObject candidate = file;
                            if (candidate != null && isValidLocaleSuffix(fName.substring(index)) && oldCandidate == null && file.isValid()) {
                                listFileObjects.add(candidate);
                                oldCandidate = candidate;
                            }
                            index = fName.indexOf(PropertiesDataLoader.PRB_SEPARATOR_CHAR, index + 1);
                        }
                    }
                }
            }
            files = new FileObject[listFileObjects.size()];
            int index = 0;
            for (FileObject file : listFileObjects) {
                files[index++] = file;
            }
            primaryEntry = getNthEntry(0);
            obj = (PropertiesDataObject) primaryEntry.getDataObject();
        } catch (DataObjectNotFoundException ex) {
            Exceptions.printStackTrace(ex);
        }
    }

    void updateEntries() {
        findEntries();
        if (files != null) {
            buildKeySet();
        }
    }

    @Override
    public PropertiesFileEntry getNthEntry(int index) {
        if (files == null) {
            return super.getNthEntry(index);
//            notifyEntriesNotInitialized();
        }
        if (index >= 0 && index < files.length) {
            try {
                return (PropertiesFileEntry) ((PropertiesDataObject) DataObject.find(files[index])).getPrimaryEntry();
            } catch (DataObjectNotFoundException ex) {
                Exceptions.printStackTrace(ex);
                return null;
            }
        } else {
            return null;
        }
    }

    /**
     * Retrieves an index of a file entry representing the given file.
     *
     * @param  fileName  simple name (without path and extension) of the
     *                   primary or secondary file
     * @return  index of the entry representing a file with the given filename;
     *          or <code>-1</code> if no such entry is found
     * @exception  java.lang.IllegalStateException
     *             if the list of entries has not been initialized yet
     * @see  #getEntryByFileName
     */
    @Override
    public int getEntryIndexByFileName(String fileName) {
        if (files == null) {
            notifyEntriesNotInitialized();
        }
        for (int i = 0; i < getEntryCount(); i++) {
            if (files[i].getName().equals(fileName)) {
                return i;
            }
        }
        return -1;
    }

    /**
     * Retrieves a file entry representing the given file
     *
     * @param  fileName  simple name (excl. path, incl. extension) of the
     *                   primary or secondary file
     * @return  entry representing the given file;
     *          or <code>null</code> if not such entry is found
     * @exception  java.lang.IllegalStateException
     *             if the list of entries has not been initialized yet
     * @see  #getEntryIndexByFileName
     */
    @Override
    public PropertiesFileEntry getEntryByFileName(String fileName) {
        int index = getEntryIndexByFileName(fileName);
        try {
            return (index == -1) ? null : (PropertiesFileEntry) ((PropertiesDataObject) DataObject.find(files[index])).getPrimaryEntry();
        } catch (DataObjectNotFoundException ex) {
            Exceptions.printStackTrace(ex);
            return null;
        }
    }

    /**
     * Retrieves number of file entries.
     *
     * @return  number of file entries
     * @exception  java.lang.IllegalStateException
     *             if the list of entries has not been initialized yet
     */
    @Override
    public int getEntryCount() {
        if (files == null) {
            return 0;//super.getEntryCount();
//            notifyEntriesNotInitialized();
        }
        return files.length;
    }

    /**
     * Throws a runtime exception with a message that the entries
     * have not been initialized yet.
     *
     * @exception  java.lang.IllegalStateException  thrown always
     * @see  #updateEntries
     */
    private void notifyEntriesNotInitialized() {
        throw new IllegalStateException(
                "Resource Bundles: Entries not initialized");           //NOI18N
    }

    private static boolean isValidLocaleSuffix(String s) {
        // first char is _
        int n = s.length();
        String s1;
        // check first suffix - language (two chars)
        if (n == 3 || (n > 3 && s.charAt(3) == PropertiesDataLoader.PRB_SEPARATOR_CHAR)) {
            s1 = s.substring(1, 3).toLowerCase();
        // language must be followed by a valid country suffix or no suffix
        } else {
            return false;
        }
        // check second suffix - country (two chars)
        String s2;
        if (n == 3) {
            s2 = null;
        } else if (n == 6 || (n > 6 && s.charAt(6) == PropertiesDataLoader.PRB_SEPARATOR_CHAR)) {
            s2 = s.substring(4, 6).toUpperCase();
        // country may be followed by whatever additional suffix
        } else {
            return false;
        }

        Set<String> knownLanguages = new HashSet<String>(Arrays.asList(Locale.getISOLanguages()));
        if (!knownLanguages.contains(s1)) {
            return false;
        }

        if (s2 != null) {
            Set<String> knownCountries = new HashSet<String>(Arrays.asList(Locale.getISOCountries()));
            if (!knownCountries.contains(s2)) {
                return false;
            }
        }
        return true;
    }
    @Override
    public PropertiesOpen getOpenSupport() {
        synchronized (OPEN_SUPPORT_LOCK) {
            if (openSupport == null) {
                openSupport = new PropertiesOpen(this);
            }
            return openSupport;
        }
    }

    @Override
    public int getKeyCount() {
        try {
            return super.getKeyCount();
        } catch (IllegalStateException ie) {
            return 0;
        }
    }
}

Lines 87-92 Link Here

(-)a/properties/src/org/netbeans/modules/properties/PropertiesDataLoader.java (-7 / +12 lines)
87	/** */	87	/** */
88	private static Set<String> knownCountries;	88	private static Set<String> knownCountries;
89		89
		90	/** */
		91	private static boolean nestedView = false;
		92
90	/** Creates new PropertiesDataLoader. */	93	/** Creates new PropertiesDataLoader. */
91	public PropertiesDataLoader() {	94	public PropertiesDataLoader() {
92	super("org.netbeans.modules.properties.PropertiesDataObject"); // NOI18N	95	super("org.netbeans.modules.properties.PropertiesDataObject"); // NOI18N
Lines 153-166 Link Here
153	* corresponding to an existing file	156	* corresponding to an existing file
154	*/	157	*/
155	String fName = fo.getName();	158	String fName = fo.getName();
156	int index = fName.indexOf(PRB_SEPARATOR_CHAR);	159	if (nestedView) {
157	while (index != -1) {	160	int index = fName.indexOf(PRB_SEPARATOR_CHAR);
158	FileObject candidate = fo.getParent().getFileObject(	161	while (index != -1) {
159	fName.substring(0, index), fo.getExt());	162	FileObject candidate = fo.getParent().getFileObject(
160	if (candidate != null && isValidLocaleSuffix(fName.substring(index))) {	163	fName.substring(0, index), fo.getExt());
161	return candidate;	164	if (candidate != null && isValidLocaleSuffix(fName.substring(index))) {
		165	return candidate;
		166	}
		167	index = fName.indexOf(PRB_SEPARATOR_CHAR, index + 1);
162	}	168	}
163	index = fName.indexOf(PRB_SEPARATOR_CHAR, index + 1);
164	}	169	}
165	return fo;	170	return fo;
166	} else {	171	} else {




import org.openide.loaders.DataFolder;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObject;
import org.openide.loaders.FileEntry;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.nodes.NodeTransfer;

    public PropertiesDataNode(DataObject dataObject, Children children) {
        super(dataObject, children);
        setIconBaseWithExtension("org/netbeans/modules/properties/propertiesObject.png"); // NOI18N
        
        dataObjectListener = new NameUpdater();
        dataObject.addPropertyChangeListener(
                WeakListeners.propertyChange(dataObjectListener, dataObject));

    } // End of NewLocaleType class.

    private static boolean containsLocale(PropertiesDataObject propertiesDataObject, Locale locale) {
        FileObject file = propertiesDataObject.getBundleStructure().getNthEntry(0).getFile();
//        FileObject file = propertiesDataObject.getPrimaryFile();
        String newName = file.getName() + PropertiesDataLoader.PRB_SEPARATOR_CHAR + locale;
        BundleStructure structure = propertiesDataObject.getBundleStructure();
        for (int i = 0; i<structure.getEntryCount();i++) {
            FileObject f = structure.getNthEntry(i).getFile();
            if (newName.startsWith(f.getName()) && f.getName().length() > file.getName().length())
                file = f;
        }
        return file.getName().equals(newName);
    }
}




 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */


package org.netbeans.modules.properties;


import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;

import org.openide.loaders.DataNode;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.loaders.MultiDataObject;
import org.openide.nodes.Children;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.WeakListeners;
import static java.util.logging.Level.FINER;


    /** Generated Serialized Version UID. */
    static final long serialVersionUID = 4795737295255253334L;

    static final Logger LOG = Logger.getLogger(PropertiesDataObject.class.getName());

    /** Structural view of the dataobject */
    private transient BundleStructure bundleStructure;

    /** Open support for this data object. Provides editable table view on bundle. */
    private transient PropertiesOpen openSupport;


    // Hack due having lock on secondaries, can't override handleCopy, handleMove at all.
    /** Suffix used by copying/moving dataObject. */
    private transient String pasteSuffix;

    /** */
    private Lookup lookup;


     *              for the specified file
     */
    public PropertiesDataObject(final FileObject primaryFile,
            final PropertiesDataLoader loader)
            throws DataObjectExistsException {
        super(primaryFile, loader);
        // use editor support

    PropertiesEncoding getEncoding() {
        return ((PropertiesDataLoader) getLoader()).getEncoding();
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    /** Initializes the object. Used by construction and deserialized. */
    private void initialize() {
        bundleStructure = null;

    CookieSet getCookieSet0() {
        return getCookieSet();
    }

    /** Copies primary and secondary files to new folder.
     * Overrides superclass method.
     * @param df the new folder

            pasteSuffix = null;
        }
    }

    /** Moves primary and secondary files to a new folder.
     * Overrides superclass method.
     * @param df the new folder


        try {
            pasteSuffix = createPasteSuffix(df);

            return super.handleMove(df);
        } finally {
            pasteSuffix = null;
        }
    }

    /** Gets suffix used by entries by copying/moving. */
    String getPasteSuffix() {
        return pasteSuffix;

    void removeSecondaryEntry2(Entry fe) {
        if (LOG.isLoggable(FINER)) {
            LOG.finer("removeSecondaryEntry2(Entry "                    //NOI18N
                    + FileUtil.getFileDisplayName(fe.getFile()) + ')');
        }
        removeSecondaryEntry (fe);
    }

        String basicName = getPrimaryFile().getName();

        DataObject[] children = folder.getChildren();


        // Repeat until there is not such file name.
        for(int i = 0; ; i++) {
            String newName;

            if (i == 0) {
                newName = basicName;
            } else {
                newName = basicName + i;
            }
            boolean exist = false;

            for(int j = 0; j < children.length; j++) {
                if(children[j] instanceof PropertiesDataObject && newName.equals(children[j].getName())) {
                    exist = true;
                    break;
                }
            }

            if(!exist) {
                if (i == 0) {
                    return ""; // NOI18N


    /** Returns open support. It's used by all subentries as open support too. */
    public PropertiesOpen getOpenSupport() {
//        synchronized (OPEN_SUPPORT_LOCK) {
            return ((MultiBundleStructure)getBundleStructure()).getOpenSupport();
//            PropertiesDataObject dataObject = this;
//            try {
//                dataObject = Util.findPrimaryDataObject(this);
//            } catch (DataObjectNotFoundException ex) {
//                Exceptions.printStackTrace(ex);
//            }
//            if (this == dataObject) {
//                    if (openSupport == null) {
//                        openSupport = new PropertiesOpen(this);
//                    }
//
//                    return openSupport;
//            } else {
//                return dataObject.getOpenSupport();
//            }
//        }
    }

    /** Updates modification status of this dataobject from its entries. */

     *
     * @return the node representation for this data object
     * @see DataNode
     */
    @Override
    protected Node createNodeDelegate () {
        return new PropertiesDataNode(this);

        return new PropertiesChildren();
    }

    //TODO XXX Now it is always false
    boolean isMultiLocale() {
        return secondaryEntries().size() > 0;
    }

    /** Returns a structural view of this data object */
    public BundleStructure getBundleStructure() {
        PropertiesDataObject dataObject = null;
        try {
            dataObject = Util.findPrimaryDataObject(this);
        } catch (DataObjectNotFoundException ex) {
            Exceptions.printStackTrace(ex);
        }
        if (this == dataObject) {
            if (bundleStructure == null) {
                bundleStructure = new MultiBundleStructure(this);
                ((MultiBundleStructure)bundleStructure).updateEntries();
            }
            return bundleStructure;
        } else {
            return dataObject.getBundleStructure();
        }
    }

    /** Comparator used for ordering secondary files, works over file names */

        LOG.finer("fireNameChange()");                                  //NOI18N
        firePropertyChange(PROP_NAME, null, null);
    }

    /** Deserialization. */
    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
        in.defaultReadObject();
        initialize();
    }


    /** Children of this <code>PropertiesDataObject</code>. */
    private class PropertiesChildren extends Children.Keys<String> {


        private PropertyChangeListener propertyListener = null;
        private PropertyChangeListener weakPropListener = null;


        /** Constructor.*/
        PropertiesChildren() {
            super();
        }


        /** Sets all keys in the correct order */
        protected void mySetKeys() {
            TreeSet<String> newKeys = new TreeSet<String>(new Comparator<String>() {

            });

            newKeys.add(getPrimaryEntry().getFile().getName());

            for (Entry entry : secondaryEntries()) {
                newKeys.add(entry.getFile().getName());
            }

        @Override
        protected void addNotify () {
            mySetKeys();

            // listener
            if(propertyListener == null) {
                propertyListener = new PropertyChangeListener () {
                    public void propertyChange(PropertyChangeEvent evt) {
                        if(PROP_FILES.equals(evt.getPropertyName())) {
                            if (isMultiLocale()) {
                                mySetKeys();
                            } else {
                                // These children are only used for two or more locales.
                                // If only default locale is left, disconnect the listener.

                                if (propertyListener != null) {
                                    PropertiesDataObject.this.removePropertyChangeListener(weakPropListener);
                                    propertyListener = null;
                                }
                            }
                        }
                    }
                };
                    }
                }; 
                weakPropListener = WeakListeners.propertyChange(propertyListener, PropertiesDataObject.this);
                PropertiesDataObject.this.addPropertyChangeListener(weakPropListener);
            }

            if (entryName == null) {
                return null;
            }

            PropertiesFileEntry entry = (PropertiesFileEntry)getPrimaryEntry();

            if(entryName.equals(entry.getFile().getName())) {
                return new Node[] {entry.getNodeDelegate()};
            }
            for(Iterator<Entry> it = secondaryEntries().iterator();it.hasNext();) {
                entry = (PropertiesFileEntry)it.next();

                if (entryName.equals(entry.getFile().getName())) {
                    return new Node[] {entry.getNodeDelegate()};
                }
            }

            return null;
        }





import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import javax.swing.Action;
import javax.swing.event.ChangeListener;
import javax.swing.JPanel;

import org.openide.util.actions.SystemAction;
import org.openide.windows.CloneableOpenSupport;
import org.openide.windows.CloneableTopComponent;
import org.openide.util.Utilities;
import org.openide.DialogDescriptor;
import org.openide.filesystems.FileUtil;


                            implements OpenCookie, CloseCookie {

    /** Main properties dataobject */
    @Deprecated
    PropertiesDataObject propDataObject;


    private List<PropertiesDataObject> dataObjectList;

    private BundleStructure bundleStructure;
    /** Listener for modificationc on dataobject, adding and removing save cookie */
    PropertyChangeListener modifL;


    

    /** Constructor */
    @Deprecated
    public PropertiesOpen(PropertiesDataObject propDataObject) {
        super(new Environment(propDataObject));
        
        this.propDataObject = propDataObject;

        //PENDING Add Listeners for all DataObject from this OpenSupport
        this.propDataObject.addPropertyChangeListener(WeakListeners.propertyChange(modifL =
            new ModifiedListener(), this.propDataObject));
    }

    public PropertiesOpen(BundleStructure structure) {
        super(new Environment(structure));

        this.bundleStructure = structure;
        addModifiedListeners();
    }

    private void addModifiedListeners() {
        BundleStructure structure = bundleStructure;
        dataObjectList = new ArrayList<PropertiesDataObject>();
        PropertiesDataObject dataObject;
        modifL = new ModifiedListener();
        for (int i=0;i<structure.getEntryCount();i++) {
            dataObject = (PropertiesDataObject) structure.getNthEntry(i).getDataObject();
            dataObject.addPropertyChangeListener(WeakListeners.propertyChange(modifL, dataObject));
            dataObjectList.add(dataObject);
        }
    }

    protected void addDataObject(PropertiesDataObject dataObject) {
        dataObject.removePropertyChangeListener(WeakListeners.propertyChange(modifL, dataObject));
        dataObject.addPropertyChangeListener(WeakListeners.propertyChange(modifL, dataObject));
        env = new Environment(bundleStructure);
        PropertiesCloneableTopComponent topComp = (PropertiesCloneableTopComponent) allEditors.getArbitraryComponent();
        if (topComp != null) {
            topComp.dataObjectAdded(dataObject);
        }
        dataObjectList.add(dataObject);
}
    /** 
     * Tests whether all data is saved, and if not, prompts the user to save.
     *

     */
    @Override
    protected boolean canClose() {
        PropertiesDataObject dataObject;
        SaveCookie saveCookie = null;
        HashMap<SaveCookie,PropertiesDataObject> map = new HashMap<SaveCookie,PropertiesDataObject>();
        for (int i=0;i<bundleStructure.getEntryCount();i++) {
            dataObject = (PropertiesDataObject) bundleStructure.getNthEntry(i).getDataObject();
            saveCookie = dataObject.getCookie(SaveCookie.class);
            //Need to find all saveCookie
            if (saveCookie != null) map.put(saveCookie, dataObject);
        }
        if (map.isEmpty()) {
            return true;
        }
        stopEditing();

                                           "CTL_Question");         //NOI18N
        String question = NbBundle.getMessage(PropertiesOpen.class,
                                              "MSG_SaveFile",       //NOI18N
                                              bundleStructure.getNthEntry(0).getName());
        String optionSave = NbBundle.getMessage(PropertiesOpen.class,
                                                "CTL_Save");        //NOI18N
        String optionDiscard = NbBundle.getMessage(PropertiesOpen.class,

        /* Save the file if the answer was "Save": */
        if (answer == optionSave) {
            try {
                for (SaveCookie save : map.keySet()) {
                    save.save();
                    map.get(save).updateModificationStatus();
                }
            }
            catch (IOException e) {
                ErrorManager.getDefault().notify(e);
                return false;
            }
        }
        dataObject = null;
        for (int i=0;i<bundleStructure.getEntryCount();i++) {
            dataObject = (PropertiesDataObject) bundleStructure.getNthEntry(i).getDataObject();
            dataObject.updateModificationStatus();
        }

        return (answer == optionSave || answer == optionDiscard);
    }

     * @return the cloneable top component for this support
     */
    protected CloneableTopComponent createCloneableTopComponent() {
//        return new PropertiesCloneableTopComponent(propDataObject);
        return new PropertiesCloneableTopComponent(bundleStructure);
    }

    /**

     */
    protected String messageOpening() {
        return NbBundle.getMessage(PropertiesOpen.class, "LBL_ObjectOpen", // NOI18N
            bundleStructure.getNthEntry(0).getName(),
            bundleStructure.getNthEntry(0).getFile().toString()
        );
    }


        if (undoRedoManager != null) {
            return undoRedoManager;
        } else {
            return new CompoundUndoRedoManager(bundleStructure);
        }
    }

    /** Helper method. Closes documents. */
    private synchronized void closeDocuments() {
        BundleStructure structure = bundleStructure;
        for (int i = 0; i< structure.getEntryCount(); i++) {
            closeEntry(structure.getNthEntry(i));
        }
    }


        }
    }

    /**
     * Helper method. Should be called only if the object has SaveCookie
     * @return true if closing this editor whithout saving would result in loss of data
     *  because al least one of the modified files is not open in the code editor

    private boolean shouldAskSave() {
        // for each entry : if there is a SaveCookie and no open editor component, return true.
        // if passed for all entries, return false
        BundleStructure structure = bundleStructure;
        PropertiesFileEntry entry;
        SaveCookie savec;
        for (int i = 0; i < structure.getEntryCount(); i++) {
            entry = structure.getNthEntry(i);
        }

        for (Iterator it = propDataObject.secondaryEntries().iterator(); it.hasNext(); ) {
            entry = (PropertiesFileEntry)it.next();
            savec = entry.getCookie(SaveCookie.class);
            if ((savec != null) && !entry.getPropertiesEditor().hasOpenedEditorComponent()) {
                return true;

        return false;
    }


    /** Environment that connects the open support together with {@code DataObject}. */
    private static class Environment implements CloneableOpenSupport.Env, Serializable,
        PropertyChangeListener, VetoableChangeListener {

        static final long serialVersionUID = -1934890789745432531L;
        
        /** Object to serialize and be connected to. */
        @Deprecated
        private DataObject dataObject;

        private BundleStructure bundleStructure;
        
        /** Support for firing of property changes. */
        private transient PropertyChangeSupport propSupp;

         * are also rethrown to own listeners.
         * @param dataObject data object to be attached to
         */
        @Deprecated
        public Environment(PropertiesDataObject dataObject) {
            this.dataObject = dataObject;
            dataObject.addPropertyChangeListener(WeakListeners.propertyChange(this, dataObject));
            dataObject.addVetoableChangeListener(WeakListeners.vetoableChange(this, dataObject));
        }

        public Environment(BundleStructure structure) {
            this.bundleStructure = structure;
            dataObject = bundleStructure.getNthEntry(0).getDataObject();
            addListeners();
        }


        private void addListeners() {
            BundleStructure structure = bundleStructure;
            PropertiesDataObject dataObj;
            for(int i=0;i<structure.getEntryCount();i++) {
                dataObj = (PropertiesDataObject) structure.getNthEntry(i).getDataObject();
                dataObj.addPropertyChangeListener(WeakListeners.propertyChange(this, dataObj));
                dataObj.addVetoableChangeListener(WeakListeners.vetoableChange(this, dataObj));
            }

        }
        /** Implements {@code CloneableOpenSupport.Env} interface. Adds property listener. */
        public void addPropertyChangeListener(PropertyChangeListener l) {
            prop().addPropertyChangeListener(l);

            veto().removeVetoableChangeListener(l);
        }

        /**
         * Implements {@code CloneableOpenSupport} interface.
         * Method that allows environment to find its cloneable open support.
         * @return the support or null if the environemnt is not in valid 
         * state and the CloneableOpenSupport cannot be found for associated
         * data object
         */
        @Deprecated
        //TODO PENDING Called from super class need to preserve
        public CloneableOpenSupport findCloneableOpenSupport() {
            return (CloneableOpenSupport) dataObject.getCookie(OpenCookie.class);
        }

        public CloneableOpenSupport findCloneableOpenSupport(PropertiesDataObject dataObject) {
            return (CloneableOpenSupport)dataObject.getCookie(OpenCookie.class);
        }

        /** 
         * Implements {@code CloneableOpenSupport.Env} interface.
         * Test whether the support is in valid state or not.

         * referenced to does not exist anymore.
         * @return true or false depending on its state
         */
        @Deprecated
        public boolean isValid() {
            return dataObject.isValid();
        }

        public boolean isValid(PropertiesDataObject dataObject) {
            return dataObject.isValid();
        }

        
        /**
         * Implements {@code CloneableOpenSupport.Env} interface. 

         * @return true if the object is modified
         */
        public boolean isModified() {
            //if one dataObject is modified assume that everything modified
            for (int i=0; i < bundleStructure.getEntryCount();i++) {
                if (bundleStructure.getNthEntry(i).getDataObject().isModified()) {
                    return true;
                }
            }
            return false;
        }

        public boolean isModified(PropertiesDataObject dataObject) {
            return dataObject.isModified();
        }


         *   (for example when the file is readonly), when such exception
         *   is the support should discard all previous changes
         */
        @Deprecated
        public void markModified() throws java.io.IOException {
            dataObject.setModified(true);
        }

        public void markModified(PropertiesDataObject dataObject) throws java.io.IOException {
            dataObject.setModified(true);
        }
        /** 
         * Implements {@code CloneableOpenSupport.Env} interface.
         * Reverse method that can be called to make the environment unmodified.
         */
        @Deprecated
        public void unmarkModified() {
            dataObject.setModified(false);
        }

        public void unmarkModified(PropertiesDataObject dataObject) {
            dataObject.setModified(false);
        }
        

         */
        public void propertyChange(PropertyChangeEvent evt) {
            if(DataObject.PROP_MODIFIED.equals(evt.getPropertyName())) {
                PropertiesDataObject dataObj = null;
                if (evt.getSource() instanceof PropertiesDataObject) {
                    dataObj = (PropertiesDataObject) evt.getSource();
                }
                if (dataObj!=null) {
                    if(dataObj.isModified()) {
                        dataObj.addVetoableChangeListener(this);
                    } else {
                        dataObj.removeVetoableChangeListener(this);
                    }
                }
            } else if(DataObject.PROP_VALID.equals(evt.getPropertyName ())) { 
                // We will handle the object invalidation here.

                    return;
                }

                PropertiesDataObject dataObj = null;
                if (evt.getSource() instanceof PropertiesDataObject) {
                    dataObj = (PropertiesDataObject) evt.getSource();
                }
                if (dataObj != null) {
                    bundleStructure.updateEntries();
                    bundleStructure.notifyOneFileChanged(dataObj.getPrimaryFile());
                    if (bundleStructure.getEntryCount() == 0) {
                // Loosing validity.
//                PropertiesOpen support = (PropertiesOpen)findCloneableOpenSupport();
                        PropertiesOpen support = (PropertiesOpen)findCloneableOpenSupport(dataObj);
                        if(support != null ) {
                    
                            // Mark the object as not being modified, so nobody
                            // will ask for save.
                            unmarkModified((PropertiesDataObject) evt.getSource());
                    
                            support.close(false);
                        }
                    }
                }
            } else {
                firePropertyChange (

    /** Inner class. Listens to modifications and updates save cookie. */
    private final class ModifiedListener implements SaveCookie, PropertyChangeListener {


        /** Gives notification that the DataObject was changed.
        * @param ev PropertyChangeEvent
        */
        public void propertyChange(PropertyChangeEvent evt) {
            // Data object changed, reset the UndoRedo manager.
            if (DataObject.PROP_MODIFIED.equals(evt.getPropertyName())) {
                if (evt.getSource() instanceof  PropertiesDataObject) {
                    PropertiesDataObject dataObject = (PropertiesDataObject) evt.getSource();
                    if(bundleStructure.getEntryByFileName(dataObject.getName())!=null) {
                        ((CompoundUndoRedoManager) PropertiesOpen.this.getUndoRedo()).reset(bundleStructure);
                            if (((Boolean)evt.getNewValue()).booleanValue()) {
                                addSaveCookie(dataObject);
                            } else {
                                removeSaveCookie(dataObject);
                            }
                     }
                }
            }
        }

        * @exception IOException on I/O error
        */
        public void saveDocument() throws IOException {
            BundleStructure structure = bundleStructure;
            SaveCookie save;
            for (int i=0; i<structure.getEntryCount();i++) {
                save = structure.getNthEntry(i).getCookie(SaveCookie.class);
            }

            for (Iterator it = propDataObject.secondaryEntries().iterator(); it.hasNext();) {
                save = ((PropertiesFileEntry) it.next()).getCookie(SaveCookie.class);
                if (save != null) {
                    save.save();
                }

        }

        /** Adds save cookie to the dataobject. */
        @Deprecated
        private void addSaveCookie() {
            if(propDataObject.getCookie(SaveCookie.class) == null) {
                propDataObject.getCookieSet0().add(this);
            }
        }

        private void addSaveCookie(PropertiesDataObject propDataObject) {
            if(propDataObject.getCookie(SaveCookie.class) == null) {
                propDataObject.getCookieSet0().add(this);
            }
        }
        
        /** Removes save cookie from the dataobject. */
        @Deprecated
        private void removeSaveCookie() {
            if(propDataObject.getCookie(SaveCookie.class) == this) {
                propDataObject.getCookieSet0().remove(this);
            }
        }

        private void removeSaveCookie(PropertiesDataObject propDataObject) {
            if(propDataObject.getCookie(SaveCookie.class) == this) {
                propDataObject.getCookieSet0().remove(this);
            }

            final PropertiesCloneableTopComponent editor = (PropertiesCloneableTopComponent)PropertiesOpen.super.openCloneableTopComponent();
            editor.requestActive();
            
            BundleStructure bs = bundleStructure;
            bs.updateEntries();
            // Find indexes.
            int entryIndex = bs.getEntryIndexByFileName(entry.getFile().getName());
            int rowIndex   = bs.getKeyIndexByName(key);

                        }

                        // Update selection & edit.
//XXX This caused to open properties for editing with wrong values
//                        table.getColumnModel().getSelectionModel().setSelectionInterval(row, column);
//                        table.getSelectionModel().setSelectionInterval(row, column);

                        table.editCellAt(row, column);
                    }

    public static class PropertiesCloneableTopComponent extends CloneableTopComponent {

        /** Reference to underlying {@code PropertiesDataObject}. */
        @Deprecated
        private PropertiesDataObject propDataObject;

        private PropertiesDataObject[] dataObjecs;
        /** Listener for changes on {@code propDataObject} name and cookie properties.
         * Changes display name of components accordingly. */
        private transient PropertyChangeListener dataObjectListener;

        private transient static HashMap<PropertiesDataObject,PropertyChangeListener> weakListeners;

        /** Generated serial version UID. */
        static final long serialVersionUID =2836248291419024296L;
        

        
        /** Constructor.
        * @param propDataObject data object we belong to */
        @Deprecated
        public PropertiesCloneableTopComponent (PropertiesDataObject propDataObject) {
            this.propDataObject  = propDataObject;

            initialize();
        }

        private MultiBundleStructure bundleStructure;

        public PropertiesCloneableTopComponent(BundleStructure structure) {
            this.bundleStructure = (MultiBundleStructure) structure;
            propDataObject = (PropertiesDataObject) bundleStructure.getNthEntry(0).getDataObject();
            dataObjecs = new PropertiesDataObject[bundleStructure.getEntryCount()];
            for (int i=0; i<bundleStructure.getEntryCount();i++) {
                dataObjecs[i] = (PropertiesDataObject) bundleStructure.getNthEntry(i).getDataObject();
            }
            weakListeners = new HashMap<PropertiesDataObject, PropertyChangeListener>();
            initialize();
        }
        /**
         */
        @Override

        private void initialize() {
            initComponents();
            setupActions();
            BundleStructure structure = bundleStructure;
            PropertiesDataObject dataObject;

            Node[] node = new Node[structure.getEntryCount()];
            dataObjectListener = new NameUpdater();

            for( int i=0; i<structure.getEntryCount();i++) {
                    dataObject = dataObjecs[i];//(PropertiesDataObject) structure.getNthEntry(i).getDataObject();
                    node[i] = dataObject.getNodeDelegate();
                    weakListeners.put(dataObject,WeakListeners.propertyChange(dataObjectListener, dataObject));
                    dataObject.addPropertyChangeListener(weakListeners.get(dataObject));
            }
            
            setActivatedNodes(node);

            updateName();
        }

        /**
         * Called from PropertiesOpen when new DataObject added
         * @param dataObject to add listener to
         */
        protected void dataObjectAdded(PropertiesDataObject dataObject) {
            dataObject.removePropertyChangeListener(WeakListeners.propertyChange(dataObjectListener, dataObject));
            dataObject.addPropertyChangeListener(WeakListeners.propertyChange(dataObjectListener, dataObject));
        }
        
        /* Based on class DataNode.PropL. */

            
            /** */
            private final int action;

            /**
             */
            NameUpdater() {

                    previous.removeFileStatusListener(weakL);
                }
                try {
                    previous = bundleStructure.getNthEntry(0).getFile().getFileSystem();
                    if (weakL == null) {
                        weakL = org.openide.filesystems.FileUtil
                                .weakFileStatusListener(this, previous);

                }
                
                boolean thisChanged = false;
                for (int i=0;i<bundleStructure.getEntryCount();i++) {
                    if(ev.hasChanged(bundleStructure.getNthEntry(i).getFile())) {
                        thisChanged = true;
                        break;
                    }

            /**
             */
            public void propertyChange(PropertyChangeEvent e) {
                //PENDING Add correct propDataObject
                if (bundleStructure.getEntryCount() == 0) {return;}
                if (!bundleStructure.getNthEntry(0).getDataObject().isValid()) {
                    return;
                }
                

        private void updateName() {
            assert EventQueue.isDispatchThread();
            
            final String name = bundleStructure.getNthEntry(0).getName();
            final String displayName = displayName();
            final String htmlDisplayName = htmlDisplayName();
            final String toolTip = messageToolTip();

        /**
         */
        private String addModifiedInfo(String name) {
            boolean modified = false;
            for (int i=0;i<bundleStructure.getEntryCount();i++) {
                if(bundleStructure.getNthEntry(i).getDataObject().getCookie(SaveCookie.class) != null) {
                    modified = true;
                    break;
                }
            }
            int version = modified ? 1 : 3;
            return NbBundle.getMessage(PropertiesCloneableTopComponent.class,
                                       "LBL_EditorName",                //NOI18N

         * @see  #htmlDisplayName
         */
        private String displayName() {
            String nameBase = bundleStructure.getNthEntry(0).getDataObject().getNodeDelegate().getDisplayName();
            return addModifiedInfo(nameBase);
        }
        

         * @see  #displayName()
         */
        private String htmlDisplayName() {
            final Node node = bundleStructure.getNthEntry(0).getDataObject().getNodeDelegate();
            String displayName = node.getHtmlDisplayName();
            if (displayName != null) {
                if (!displayName.startsWith("<html>")) {                //NOI18N

        
        /** Gets string for tooltip. */
        private String messageToolTip() {
            FileObject fo = bundleStructure.getNthEntry(0).getFile();
            return FileUtil.getFileDisplayName(fo);
        }
        
        /**
         * 
         * Overrides superclass method. When closing last view, also close the document.
         * @return {@code true} if close succeeded
         */
        @Override
        protected boolean closeLast () {
            if (!bundleStructure.getOpenSupport().canClose ()) {
                // if we cannot close the last window
                return false;
            }
            bundleStructure.getOpenSupport().closeDocuments();
            PropertyChangeListener l;
            for (PropertiesDataObject dataObject:dataObjecs) {
                l = weakListeners.get(dataObject);
                if (l!=null) {
                    dataObject.removePropertyChangeListener(l);
                    weakListeners.remove(l);
                }
            }
            return true;
        }


         */
        @Override
        protected CloneableTopComponent createClonedObject () {
            return new PropertiesCloneableTopComponent(bundleStructure);
        }

        /** Gets {@code Icon}. */

         */
        @Override
        public UndoRedo getUndoRedo () {
            return  bundleStructure.getOpenSupport().getUndoRedo();
        }

        /** Inits the subcomponents. Sets layout for this top component and adds {@code BundleEditPanel} to it. 

            c.weightx = 1.0;
            c.weighty = 1.0;
            c.gridwidth = GridBagConstraints.REMAINDER;
            JPanel panel = new BundleEditPanel(bundleStructure, new PropertiesTableModel(bundleStructure));
            gridbag.setConstraints(panel, c);
            add(panel);
        }

         *  is not valid.
         */
        private boolean discard () {
            return bundleStructure == null;
        }
        


        @Override
        public void writeExternal (ObjectOutput out) throws IOException {
            super.writeExternal(out);
            out.writeObject(bundleStructure.getNthEntry(0).getDataObject());
        }

        /** 

            super.readExternal(in);

            propDataObject = (PropertiesDataObject)in.readObject();
            bundleStructure = (MultiBundleStructure) propDataObject.getBundleStructure();
            dataObjecs = new PropertiesDataObject[bundleStructure.getEntryCount()];
            for (int i=0;i<bundleStructure.getEntryCount();i++) {
                dataObjecs[i] = (PropertiesDataObject) bundleStructure.getNthEntry(i).getDataObject();
            }
            weakListeners = new HashMap<PropertiesDataObject, PropertyChangeListener>();
            initialize();
        }
    } // End of nested class PropertiesCloneableTopComponent.

        // Constructor
        
        /** Collects all UndoRedo managers from all editor support of all entries. */
        @Deprecated
        public CompoundUndoRedoManager(PropertiesDataObject obj) {
            init(obj);
        }
        public CompoundUndoRedoManager(BundleStructure structure) {
            init(structure);
        }

        /** Initialize set of managers. */
        @Deprecated
        private void init(PropertiesDataObject obj) {
            BundleStructure structure = obj.getBundleStructure();
            for(int i=0; i< structure.getEntryCount(); i++) {
                managers.add(structure.getNthEntry(i).getPropertiesEditor().getUndoRedoManager());
            }
        }

        private void init(BundleStructure structure) {
            for(int i=0; i< structure.getEntryCount(); i++) {
                managers.add(structure.getNthEntry(i).getPropertiesEditor().getUndoRedoManager());
            }
        }

        /** Resets the managers. Used when data object has changed. */
        @Deprecated
        public synchronized void reset(PropertiesDataObject obj) {
            managers.clear();
            init(obj);
        }

        public synchronized void reset(BundleStructure structure) {
            managers.clear();
            init(structure);
        }

        /** Gets manager which undo edit comes to play.*/

Lines 160-166 Link Here

(-)a/properties/src/org/netbeans/modules/properties/PropertiesTableCellEditor.java (-1 / +1 lines)
160	public void setValue(Object x) {	160	public void setValue(Object x) {
161	// PENDING - due to a compiler error explicitly do "super" code instead of calling super	161	// PENDING - due to a compiler error explicitly do "super" code instead of calling super
162	this.value = x;	162	this.value = x;
163	//super.setValue(x);	163	// super.setValue(x);
164	PropertiesTableModel.StringPair sp = (PropertiesTableModel.StringPair)x;	164	PropertiesTableModel.StringPair sp = (PropertiesTableModel.StringPair)x;
165		165
166	// set values as they deserve	166	// set values as they deserve

Lines 284-289 Link Here

(-)a/properties/src/org/netbeans/modules/properties/PropertiesTableModel.java (-6 / +16 lines)
284	fireTableChanged(new TableModelEvent(this, 0, getRowCount() - 1, columnModelIndex));	284	fireTableChanged(new TableModelEvent(this, 0, getRowCount() - 1, columnModelIndex));
285	}	285	}
286		286
		287	/**
		288	* Get FileEntry according to column in Table View
		289	* @param column
		290	* @return
		291	*/
		292	PropertiesFileEntry getFileEntry(int column) {
		293	return structure.getNthEntry(column-1);
		294	}
287	/** Overrides superclass method. */	295	/** Overrides superclass method. */
288	@Override	296	@Override
289	public String toString() {	297	public String toString() {
Lines 364-371 Link Here
364	// Note: Normal way would be use the next commented out rows, which should do in effect	372	// Note: Normal way would be use the next commented out rows, which should do in effect
365	// the same thing like reseting the model, but it doesn't, therefore we reset the model directly.	373	// the same thing like reseting the model, but it doesn't, therefore we reset the model directly.
366		374
367	//cancelEditingInTables(getDefaultCancelSelector());	375	cancelEditingInTables(getDefaultCancelSelector());
368	//fireTableStructureChanged();	376	fireTableStructureChanged();
369		377
370	Object[] list = PropertiesTableModel.super.listenerList.getListenerList();	378	Object[] list = PropertiesTableModel.super.listenerList.getListenerList();
371	for(int i = 0; i < list.length; i++) {	379	for(int i = 0; i < list.length; i++) {
Lines 396-404 Link Here
396	} else if(changeType == PropertyBundleEvent.CHANGE_FILE) {	404	} else if(changeType == PropertyBundleEvent.CHANGE_FILE) {
397	// File changed.	405	// File changed.
398	final int index = structure.getEntryIndexByFileName(evt.getEntryName());	406	final int index = structure.getEntryIndexByFileName(evt.getEntryName());
		407	//This mean file deleted
399	if (index == -1) {	408	if (index == -1) {
400	if (Boolean.getBoolean("netbeans.debug.exceptions")) // NOI18N	409	fireTableStructureChanged();
401	(new Exception("Changed file not found")).printStackTrace(); // NOI18N	410	// if (Boolean.getBoolean("netbeans.debug.exceptions")) // NOI18N
		411	// (new Exception("Changed file not found")).printStackTrace(); // NOI18N
402	return;	412	return;
403	}	413	}
404		414
Lines 409-416 Link Here
409	return (column == index + 1);	419	return (column == index + 1);
410	}	420	}
411	});	421	});
412		422	// fireTableColumnChanged(index + 1);
413	fireTableColumnChanged(index + 1);	423	fireTableStructureChanged();
414	} else if(changeType == PropertyBundleEvent.CHANGE_ITEM) {	424	} else if(changeType == PropertyBundleEvent.CHANGE_ITEM) {
415	// one item changed	425	// one item changed
416	final int index2 = structure.getEntryIndexByFileName(evt.getEntryName());	426	final int index2 = structure.getEntryIndexByFileName(evt.getEntryName());

Lines 45-50 Link Here

(-)a/properties/src/org/netbeans/modules/properties/Util.java (-8 / +142 lines)
45		45
46	import java.io.IOException;	46	import java.io.IOException;
47	import java.text.MessageFormat;	47	import java.text.MessageFormat;
		48	import java.util.Arrays;
		49	import java.util.HashSet;
48	import java.util.Locale;	50	import java.util.Locale;
49	import org.openide.DialogDisplayer;	51	import org.openide.DialogDisplayer;
50	import org.openide.NotifyDescriptor;	52	import org.openide.NotifyDescriptor;
Lines 52-59 Link Here
52	import org.openide.filesystems.FileObject;	54	import org.openide.filesystems.FileObject;
53	import org.openide.filesystems.FileSystem;	55	import org.openide.filesystems.FileSystem;
54	import org.openide.filesystems.FileUtil;	56	import org.openide.filesystems.FileUtil;
		57	import org.openide.filesystems.Repository;
55	import org.openide.loaders.DataFolder;	58	import org.openide.loaders.DataFolder;
56	import org.openide.loaders.DataObject;	59	import org.openide.loaders.DataObject;
		60	import org.openide.loaders.DataObjectNotFoundException;
57	import org.openide.loaders.FileEntry;	61	import org.openide.loaders.FileEntry;
58		62
59	import org.openide.loaders.MultiDataObject;	63	import org.openide.loaders.MultiDataObject;
Lines 147-160 Link Here
147	* @see #getVariant	151	* @see #getVariant
148	*/	152	*/
149	public static String getLocaleSuffix(MultiDataObject.Entry fe) {	153	public static String getLocaleSuffix(MultiDataObject.Entry fe) {
150	MultiDataObject.Entry pe = fe.getDataObject().getPrimaryEntry();	154	FileObject fo = fe.getFile();
151	if (fe == pe) {	155	String fName = fo.getName();
152	return ""; //NOI18N	156	int index = fName.indexOf(PRB_SEPARATOR_CHAR);
		157	FileObject po = fo;
		158	while (index != -1) {
		159	FileObject candidate = fo.getParent().getFileObject(
		160	fName.substring(0, index), fo.getExt());
		161	if (candidate != null && isValidLocaleSuffix(fName.substring(index))) {
		162	po = candidate;
		163	}
		164	index = fName.indexOf(PRB_SEPARATOR_CHAR, index + 1);
153	}	165	}
154	String myName = fe.getFile().getName();	166	if (fo == po) {
155	String baseName = pe.getFile().getName();	167	return "";
		168	}
		169	String myName = fo.getName();
		170	String baseName = po.getName();
156	assert myName.startsWith(baseName);	171	assert myName.startsWith(baseName);
157	return myName.substring(baseName.length());	172	return myName.substring(baseName.length());
		173	// MultiDataObject.Entry pe = fe.getDataObject().getPrimaryEntry();
		174	// if (fe == pe) {
		175	// return ""; //NOI18N
		176	// }
		177	// String myName = fe.getFile().getName();
		178	// String baseName = pe.getFile().getName();
		179	// assert myName.startsWith(baseName);
		180	// return myName.substring(baseName.length());
		181	}
		182
		183	private static boolean isValidLocaleSuffix(String s) {
		184	// first char is _
		185	int n = s.length();
		186	String s1;
		187	// check first suffix - language (two chars)
		188	if (n == 3 \|\| (n > 3 && s.charAt(3) == PropertiesDataLoader.PRB_SEPARATOR_CHAR)) {
		189	s1 = s.substring(1, 3).toLowerCase();
		190	// language must be followed by a valid country suffix or no suffix
		191	} else {
		192	return false;
		193	}
		194	// check second suffix - country (two chars)
		195	String s2;
		196	if (n == 3) {
		197	s2 = null;
		198	} else if (n == 6 \|\| (n > 6 && s.charAt(6) == PropertiesDataLoader.PRB_SEPARATOR_CHAR)) {
		199	s2 = s.substring(4, 6).toUpperCase();
		200	// country may be followed by whatever additional suffix
		201	} else {
		202	return false;
		203	}
		204
		205	HashSet<String> knownLanguages = new HashSet<String>(Arrays.asList(Locale.getISOLanguages()));
		206	if (!knownLanguages.contains(s1)) {
		207	return false;
		208	}
		209
		210	if (s2 != null) {
		211	HashSet<String> knownCountries = new HashSet<String>(Arrays.asList(Locale.getISOCountries()));
		212	if (!knownCountries.contains(s2)) {
		213	return false;
		214	}
		215	}
		216	return true;
158	}	217	}
159		218
160	/**	219	/**
Lines 384-395 Link Here
384	folder = FileUtil.createFolder(folder, folderPath);	443	folder = FileUtil.createFolder(folder, folderPath);
385	fileName = fileName.substring(idx + 1);	444	fileName = fileName.substring(idx + 1);
386	}	445	}
387	FileObject templateFO = FileUtil.getConfigFile("Templates/Other/properties.properties"); // NOI18N	446	FileSystem defaultFS = Repository.getDefault().getDefaultFileSystem();
		447	FileObject templateFO = defaultFS.findResource("Templates/Other/properties.properties"); // NOI18N
388	DataObject template = DataObject.find(templateFO);	448	DataObject template = DataObject.find(templateFO);
389	return (PropertiesDataObject)	449	return (PropertiesDataObject)
390	template.createFromTemplate(DataFolder.findFolder(folder), fileName);	450	template.createFromTemplate(DataFolder.findFolder(folder), fileName);
391	}	451	}
392		452
		453	/**
		454	* Create new DataObject with requested locale and notify that new locale was added
		455	* @param propertiesDataObject DataObject to add locale
		456	* @param locale
		457	* @param copyInitialContent
		458	*/
393	public static void createLocaleFile(PropertiesDataObject propertiesDataObject,	459	public static void createLocaleFile(PropertiesDataObject propertiesDataObject,
394	String locale,	460	String locale,
395	boolean copyInitialContent)	461	boolean copyInitialContent)
Lines 402-409 Link Here
402	}	468	}
403		469
404	if(propertiesDataObject != null) {	470	if(propertiesDataObject != null) {
405	FileObject file = propertiesDataObject.getPrimaryFile();	471	// FileObject file = propertiesDataObject.getPrimaryFile();
406	final String newName = file.getName() + PropertiesDataLoader.PRB_SEPARATOR_CHAR + locale;	472	FileObject file = propertiesDataObject.getBundleStructure().getNthEntry(0).getFile();
		473	//Default locale may be deleted
		474	final String newName = getBaseName(file.getName()) + PropertiesDataLoader.PRB_SEPARATOR_CHAR + locale;
407	final FileObject folder = file.getParent();	475	final FileObject folder = file.getParent();
408	// final PropertiesEditorSupport editor = (PropertiesEditorSupport)propertiesDataObject.getCookie(PropertiesEditorSupport.class);	476	// final PropertiesEditorSupport editor = (PropertiesEditorSupport)propertiesDataObject.getCookie(PropertiesEditorSupport.class);
409	java.util.Iterator it = propertiesDataObject.secondaryEntries().iterator();	477	java.util.Iterator it = propertiesDataObject.secondaryEntries().iterator();
Lines 428-433 Link Here
428	templateFile.copy(folder, newName, PropertiesDataLoader.PROPERTIES_EXTENSION);	496	templateFile.copy(folder, newName, PropertiesDataLoader.PROPERTIES_EXTENSION);
429	}	497	}
430	});	498	});
		499	//update entries in BundleStructure
		500	propertiesDataObject.getBundleStructure().updateEntries();
		501	//find just created DataObject
		502	PropertiesDataObject dataObject = (PropertiesDataObject) DataObject.find(folder.getFileObject(newName, PropertiesDataLoader.PROPERTIES_EXTENSION));
		503	//Add it to OpenSupport
		504	propertiesDataObject.getOpenSupport().addDataObject(dataObject);
		505	//Notify BundleStructure that one file changed
		506	propertiesDataObject.getBundleStructure().notifyOneFileChanged(folder.getFileObject(newName, PropertiesDataLoader.PROPERTIES_EXTENSION));
		507	// propertiesDataObject.getBundleStructure().notifyFileAdded(folder.getFileObject(newName, PropertiesDataLoader.PROPERTIES_EXTENSION));
431	}	508	}
432	} else {	509	} else {
433	// Create an empty file - creating from template via DataObject	510	// Create an empty file - creating from template via DataObject
Lines 443-446 Link Here
443	notifyError(locale);	520	notifyError(locale);
444	}	521	}
445	}	522	}
		523
		524	/**
		525	*
		526	* @param obj DataObject
		527	* @return DataObject which represent default locale
		528	* In case when default locale is absent it will return first found locale as primary,
		529	* which has the same base name
		530	* @throws org.openide.loaders.DataObjectNotFoundException
		531	*/
		532	static PropertiesDataObject findPrimaryDataObject(PropertiesDataObject obj) throws DataObjectNotFoundException {
		533	FileObject primary = obj.getPrimaryFile();
		534	assert primary != null : "Object " + obj + " cannot have null primary file"; // NOI18N
		535	String fName;
		536	fName = primary.getName();
		537	String baseName = getBaseName(fName);
		538	FileObject parent = primary.getParent();
		539	int index = fName.indexOf(PropertiesDataLoader.PRB_SEPARATOR_CHAR);
		540	while (index != -1) {
		541	FileObject candidate = parent.getFileObject(
		542	fName.substring(0, index), primary.getExt());
		543	if (candidate != null && isValidLocaleSuffix(fName.substring(index))) {
		544	return (PropertiesDataObject) DataObject.find(candidate);
		545	} else if (candidate == null){
		546	for (FileObject file : parent.getChildren()) {
		547	if (file.getName().indexOf(baseName) != -1) {
		548	if (isValidLocaleSuffix(file.getName().substring(index))) {
		549	return (PropertiesDataObject) DataObject.find(file);
		550	}
		551	}
		552	}
		553	}
		554	index = fName.indexOf(PropertiesDataLoader.PRB_SEPARATOR_CHAR, index + 1);
		555	}
		556	return obj;
		557	}
		558
		559	// static BundleStructure findBundleStructure(PropertiesDataObject dataObject) {
		560	//
		561	// }
		562
		563	/**
		564	* @param name file name
		565	* @return Base name for this locale
		566	*/
		567	static String getBaseName(String name) {
		568	String baseName = null;
		569	int index = name.indexOf(PropertiesDataLoader.PRB_SEPARATOR_CHAR);
		570	while (index != -1) {
		571	baseName = name.substring(0, index);
		572	if (baseName != null && isValidLocaleSuffix(name.substring(index))) {
		573	return baseName;
		574	}
		575	index = name.indexOf(PropertiesDataLoader.PRB_SEPARATOR_CHAR, index + 1);
		576	}
		577	return name;
		578	}
		579
446	}	580	}

Return to bug 48263

Lines 44-49 Link Here

(-)a/properties/src/org/netbeans/modules/properties/BundleStructure.java (-14 / +39 lines)
44		44
45	import java.beans.PropertyChangeEvent;	45	import java.beans.PropertyChangeEvent;
46	import java.beans.PropertyChangeListener;	46	import java.beans.PropertyChangeListener;
		47	import java.io.Serializable;
47	import java.util.List;	48	import java.util.List;
48	import java.util.ArrayList;	49	import java.util.ArrayList;
49	import java.util.Collections;	50	import java.util.Collections;
Lines 51-56 Link Here
51	import java.util.Iterator;	52	import java.util.Iterator;
52	import java.util.Map;	53	import java.util.Map;
53	import java.util.TreeMap;	54	import java.util.TreeMap;
		55	import org.openide.filesystems.FileObject;
54	import org.openide.loaders.MultiDataObject.Entry;	56	import org.openide.loaders.MultiDataObject.Entry;
55	import org.openide.util.WeakListeners;	57	import org.openide.util.WeakListeners;
56		58
Lines 69-75 Link Here
69	* @author Petr Jiricka	71	* @author Petr Jiricka
70	*/	72	*/
71	public class BundleStructure {	73	public class BundleStructure {
72		74
73	/**	75	/**
74	* <code>PropertiesDataObject</code> whose structure is described	76	* <code>PropertiesDataObject</code> whose structure is described
75	* by this object	77	* by this object
Lines 109-115 Link Here
109		111
110	/** listens to changes on the underlying <code>PropertyDataObject</code> */	112	/** listens to changes on the underlying <code>PropertyDataObject</code> */
111	private PropertyChangeListener propListener;	113	private PropertyChangeListener propListener;
112		114
		115	protected BundleStructure() {
		116	obj = null;
		117	}
113	/**	118	/**
114	* Creates a new instance describing a given	119	* Creates a new instance describing a given
115	* <code>PropertiesDataObject</code>.	120	* <code>PropertiesDataObject</code>.
Lines 543-548 Link Here
543	return comparator.isAscending();	548	return comparator.isAscending();
544	}	549	}
545		550
		551	PropertiesOpen getOpenSupport() {
		552	throw new UnsupportedOperationException("Not yet implemented");
		553	}
		554
546	/**	555	/**
547	* Builds (or rebuilds) a sorted list of entries of the underlying	556	* Builds (or rebuilds) a sorted list of entries of the underlying
548	* <code>PropertiesDataObject<code> and a sorted list of keys gathered	557	* <code>PropertiesDataObject<code> and a sorted list of keys gathered
Lines 551-557 Link Here
551	* @see #entries	560	* @see #entries
552	* @see #keyList	561	* @see #keyList
553	*/	562	*/
554	private void updateEntries() {	563	void updateEntries() {
555	Map<String,PropertiesFileEntry> tm = new TreeMap<String,PropertiesFileEntry>(	564	Map<String,PropertiesFileEntry> tm = new TreeMap<String,PropertiesFileEntry>(
556	PropertiesDataObject.getSecondaryFilesComparator());	565	PropertiesDataObject.getSecondaryFilesComparator());
557	for (Entry entry : obj.secondaryEntries()) {	566	for (Entry entry : obj.secondaryEntries()) {
Lines 577-583 Link Here
577	*	586	*
578	* @see #keyList	587	* @see #keyList
579	*/	588	*/
580	private synchronized void buildKeySet() {	589	protected synchronized void buildKeySet() {
581	List<String> keyList = new ArrayList<String>() {	590	List<String> keyList = new ArrayList<String>() {
582	public boolean equals(Object obj) {	591	public boolean equals(Object obj) {
583	if (!(obj instanceof ArrayList)) {	592	if (!(obj instanceof ArrayList)) {
Lines 602-617 Link Here
602	int entriesCount = getEntryCount();	611	int entriesCount = getEntryCount();
603	for (int index = 0; index < entriesCount; index++) {	612	for (int index = 0; index < entriesCount; index++) {
604	PropertiesFileEntry entry = getNthEntry(index);	613	PropertiesFileEntry entry = getNthEntry(index);
605	PropertiesStructure ps = entry.getHandler().getStructure();	614	if (entry != null) {
606	if (ps != null) {	615	PropertiesStructure ps = entry.getHandler().getStructure();
607	for (Iterator<Element.ItemElem> it = ps.allItems(); it.hasNext(); ) {	616	if (ps != null) {
608	Element.ItemElem item = it.next();	617	for (Iterator<Element.ItemElem> it = ps.allItems(); it.hasNext(); ) {
609	if (item == null) {	618	Element.ItemElem item = it.next();
610	continue;	619	if (item == null) {
611	}	620	continue;
612	String key = item.getKey();	621	}
613	if (key != null && !(keyList.contains(key))) {	622	String key = item.getKey();
614	keyList.add(item.getKey());	623	if (key != null && !(keyList.contains(key))) {
		624	keyList.add(item.getKey());
		625	}
615	}	626	}
616	}	627	}
617	}	628	}
Lines 676-681 Link Here
676	* @see #removePropertyBundleListener	687	* @see #removePropertyBundleListener
677	*/	688	*/
678	public void addPropertyBundleListener(PropertyBundleListener l) {	689	public void addPropertyBundleListener(PropertyBundleListener l) {
		690	if (propBundleSupport == null) propBundleSupport = new PropertyBundleSupport(this);
679	propBundleSupport.addPropertyBundleListener(l);	691	propBundleSupport.addPropertyBundleListener(l);
680	}	692	}
681		693
Lines 707-712 Link Here
707	);	719	);
708	}	720	}
709		721
		722	void notifyOneFileChanged(FileObject file) {
		723	// PENDING - events should be finer
		724	// find out whether global key table has changed and fire a change
		725	// according to that
		726	List oldKeyList = keyList;
		727
		728	buildKeySet();
		729	if (!keyList.equals(oldKeyList)) {
		730	propBundleSupport.fireBundleDataChanged();
		731	} else {
		732	propBundleSupport.fireFileChanged(file.getName());
		733	}
		734	}
710	/**	735	/**
711	* Notifies registered listeners of a change in a single file entry.	736	* Notifies registered listeners of a change in a single file entry.
712	* Depending whether a list of keys has changed, either an event	737	* Depending whether a list of keys has changed, either an event

Line 0 Link Here

(-)a/properties/src/org/netbeans/modules/properties/MultiBundleStructure.java (+291 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
		5	*
		6	* The contents of this file are subject to the terms of either the GNU
		7	* General Public License Version 2 only ("GPL") or the Common
		8	* Development and Distribution License("CDDL") (collectively, the
		9	* "License"). You may not use this file except in compliance with the
		10	* License. You can obtain a copy of the License at
		11	* http://www.netbeans.org/cddl-gplv2.html
		12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		13	* specific language governing permissions and limitations under the
		14	* License. When distributing the software, include this License Header
		15	* Notice in each file and include the License file at
		16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
		17	* particular file as subject to the "Classpath" exception as provided
		18	* by Sun in the GPL Version 2 section of the License file that
		19	* accompanied this code. If applicable, add the following below the
		20	* License Header, with the fields enclosed by brackets [] replaced by
		21	* your own identifying information:
		22	* "Portions Copyrighted [year] [name of copyright owner]"
		23	*
		24	* If you wish your version of this file to be governed by only the CDDL
		25	* or only the GPL Version 2, indicate your decision by adding
		26	* "[Contributor] elects to include this software in this distribution
		27	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		28	* single choice of license, a recipient has the option to distribute
		29	* your version of this file under either the CDDL, the GPL Version 2 or
		30	* to extend the choice of license to its licensees as provided above.
		31	* However, if you add GPL Version 2 code and therefore, elected the GPL
		32	* Version 2 license, then the option applies only if the new code is
		33	* made subject to such option by the copyright holder.
		34	*
		35	* Contributor(s):
		36	*
		37	* Portions Copyrighted 2008 Sun Microsystems, Inc.
		38	*/
		39	package org.netbeans.modules.properties;
		40
		41	import java.io.Serializable;
		42	import java.util.ArrayList;
		43	import java.util.Arrays;
		44	import java.util.HashSet;
		45	import java.util.List;
		46	import java.util.Locale;
		47	import java.util.Set;
		48	import org.openide.filesystems.FileObject;
		49	import org.openide.loaders.DataObject;
		50	import org.openide.loaders.DataObjectNotFoundException;
		51	import org.openide.util.Exceptions;
		52
		53	/**
		54	*
		55	* @author alexeybutenko
		56	*/
		57	class MultiBundleStructure extends BundleStructure implements Serializable {
		58
		59	private transient FileObject[] files;
		60	private transient PropertiesFileEntry primaryEntry;
		61	private String baseName;
		62
		63	/** Generated Serialized Version UID. */
		64	static final long serialVersionUID = 7501232754255253334L;
65
66	private transient PropertiesOpen openSupport;
67	/** Lock used for synchronization of <code>openSupport</code> instance creation */
68	private final transient Object OPEN_SUPPORT_LOCK = new Object();
69
70
71	protected MultiBundleStructure() {
72	// super();
73	// files = null;
74	// primaryEntry = null;
75	// baseName = null;
76	}
77
78	public MultiBundleStructure(PropertiesDataObject obj) {
79	// super(obj);
80	this.obj = obj;
81	baseName = Util.getBaseName(obj.getName());
82	}
83
84	/**
85	* Find entries according to PropertiesDataObject
86	*
87	*/
88	private void findEntries() {
89	try {
90	if (obj == null) return;
91	if (!obj.isValid()) {
92	if (files.length == 1) {
93	primaryEntry = null;
94	obj = null;
95	files = null;
96	return;
97	}
98	} else {
99	obj = Util.findPrimaryDataObject(obj);
100	primaryEntry = (PropertiesFileEntry) obj.getPrimaryEntry();
101	}
102	FileObject primary = primaryEntry.getFile();
103	FileObject parent = primary.getParent();
104	List<FileObject> listFileObjects = new ArrayList<FileObject>();
105	String fName;
106	FileObject oldCandidate;
107	for (FileObject file : parent.getChildren()) {
108	fName = file.getName();
109	if (fName.equals(baseName) && file.isValid()) {
110	listFileObjects.add(0,file);
111	}
112	if (fName.indexOf(baseName) != -1) {
113	int index = fName.indexOf(PropertiesDataLoader.PRB_SEPARATOR_CHAR);
114	if (index == baseName.length()) {
115	oldCandidate = null;
116	while (index != -1) {
117	FileObject candidate = file;
118	if (candidate != null && isValidLocaleSuffix(fName.substring(index)) && oldCandidate == null && file.isValid()) {
119	listFileObjects.add(candidate);
120	oldCandidate = candidate;
121	}
122	index = fName.indexOf(PropertiesDataLoader.PRB_SEPARATOR_CHAR, index + 1);
123	}
124	}
125	}
126	}
127	files = new FileObject[listFileObjects.size()];
128	int index = 0;
129	for (FileObject file : listFileObjects) {
130	files[index++] = file;
131	}
132	primaryEntry = getNthEntry(0);
133	obj = (PropertiesDataObject) primaryEntry.getDataObject();
134	} catch (DataObjectNotFoundException ex) {
135	Exceptions.printStackTrace(ex);
136	}
137	}
138
139	void updateEntries() {
140	findEntries();
141	if (files != null) {
142	buildKeySet();
143	}
144	}
145
146	@Override
147	public PropertiesFileEntry getNthEntry(int index) {
148	if (files == null) {
149	return super.getNthEntry(index);
150	// notifyEntriesNotInitialized();
151	}
152	if (index >= 0 && index < files.length) {
153	try {
154	return (PropertiesFileEntry) ((PropertiesDataObject) DataObject.find(files[index])).getPrimaryEntry();
155	} catch (DataObjectNotFoundException ex) {
156	Exceptions.printStackTrace(ex);
157	return null;
158	}
159	} else {
160	return null;
161	}
162	}
163
164	/**
165	* Retrieves an index of a file entry representing the given file.
166	*
167	* @param fileName simple name (without path and extension) of the
168	* primary or secondary file
169	* @return index of the entry representing a file with the given filename;
170	* or <code>-1</code> if no such entry is found
171	* @exception java.lang.IllegalStateException
172	* if the list of entries has not been initialized yet
173	* @see #getEntryByFileName
174	*/
175	@Override
176	public int getEntryIndexByFileName(String fileName) {
177	if (files == null) {
178	notifyEntriesNotInitialized();
179	}
180	for (int i = 0; i < getEntryCount(); i++) {
181	if (files[i].getName().equals(fileName)) {
182	return i;
183	}
184	}
185	return -1;
186	}
187
188	/**
189	* Retrieves a file entry representing the given file
190	*
191	* @param fileName simple name (excl. path, incl. extension) of the
192	* primary or secondary file
193	* @return entry representing the given file;
194	* or <code>null</code> if not such entry is found
195	* @exception java.lang.IllegalStateException
196	* if the list of entries has not been initialized yet
197	* @see #getEntryIndexByFileName
198	*/
199	@Override
200	public PropertiesFileEntry getEntryByFileName(String fileName) {
201	int index = getEntryIndexByFileName(fileName);
202	try {
203	return (index == -1) ? null : (PropertiesFileEntry) ((PropertiesDataObject) DataObject.find(files[index])).getPrimaryEntry();
204	} catch (DataObjectNotFoundException ex) {
205	Exceptions.printStackTrace(ex);
206	return null;
207	}
208	}
209
210	/**
211	* Retrieves number of file entries.
212	*
213	* @return number of file entries
214	* @exception java.lang.IllegalStateException
215	* if the list of entries has not been initialized yet
216	*/
217	@Override
218	public int getEntryCount() {
219	if (files == null) {
220	return 0;//super.getEntryCount();
221	// notifyEntriesNotInitialized();
222	}
223	return files.length;
224	}
225
226	/**
227	* Throws a runtime exception with a message that the entries
228	* have not been initialized yet.
229	*
230	* @exception java.lang.IllegalStateException thrown always
231	* @see #updateEntries
232	*/
233	private void notifyEntriesNotInitialized() {
234	throw new IllegalStateException(
235	"Resource Bundles: Entries not initialized"); //NOI18N
236	}
237
238	private static boolean isValidLocaleSuffix(String s) {
239	// first char is _
240	int n = s.length();
241	String s1;
242	// check first suffix - language (two chars)
243	if (n == 3 \|\| (n > 3 && s.charAt(3) == PropertiesDataLoader.PRB_SEPARATOR_CHAR)) {
244	s1 = s.substring(1, 3).toLowerCase();
245	// language must be followed by a valid country suffix or no suffix
246	} else {
247	return false;
248	}
249	// check second suffix - country (two chars)
250	String s2;
251	if (n == 3) {
252	s2 = null;
253	} else if (n == 6 \|\| (n > 6 && s.charAt(6) == PropertiesDataLoader.PRB_SEPARATOR_CHAR)) {
254	s2 = s.substring(4, 6).toUpperCase();
255	// country may be followed by whatever additional suffix
256	} else {
257	return false;
258	}
259
260	Set<String> knownLanguages = new HashSet<String>(Arrays.asList(Locale.getISOLanguages()));
261	if (!knownLanguages.contains(s1)) {
262	return false;
263	}
264
265	if (s2 != null) {
266	Set<String> knownCountries = new HashSet<String>(Arrays.asList(Locale.getISOCountries()));
267	if (!knownCountries.contains(s2)) {
268	return false;
269	}
270	}
271	return true;
272	}
273	@Override
274	public PropertiesOpen getOpenSupport() {
275	synchronized (OPEN_SUPPORT_LOCK) {
276	if (openSupport == null) {
277	openSupport = new PropertiesOpen(this);
278	}
279	return openSupport;
280	}
281	}
282
283	@Override
284	public int getKeyCount() {
285	try {
286	return super.getKeyCount();
287	} catch (IllegalStateException ie) {
288	return 0;
289	}
290	}
291	}