Attachment #78506 for bug #102612

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 102612
Collapse All | Expand All




        if(formI18nInteger == null) {
            formI18nInteger = createFormI18nInteger();

            if(I18nUtil.getOptions().getLastResource2(sourceDataObject) != null)
                formI18nInteger.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2(sourceDataObject));
        }
        
        return formI18nInteger;

        else {
            formI18nInteger = createFormI18nInteger();
        
            if(I18nUtil.getOptions().getLastResource2(sourceDataObject) != null)
                formI18nInteger.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2(sourceDataObject));
        }
    }





        if(formI18nMnemonic == null) {
            formI18nMnemonic = createFormI18nMnemonic();

            if(I18nUtil.getOptions().getLastResource2(sourceDataObject) != null)
                formI18nMnemonic.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2(sourceDataObject));
        }
        
        return formI18nMnemonic;

        else {
            formI18nMnemonic = createFormI18nMnemonic();
        
            if(I18nUtil.getOptions().getLastResource2(sourceDataObject) != null)
                formI18nMnemonic.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2(sourceDataObject));
        }
    }


Lines 222-228 Link Here

(-)a/i18n.form/src/org/netbeans/modules/i18n/form/FormI18nStringEditor.java (-1 / +1 lines)
222	formI18nString = createFormI18nString();	222	formI18nString = createFormI18nString();
223	if (value instanceof String)	223	if (value instanceof String)
224	formI18nString.setValue((String)value);	224	formI18nString.setValue((String)value);
225	DataObject lastResource = I18nUtil.getOptions().getLastResource2();	225	DataObject lastResource = I18nUtil.getOptions().getLastResource2(sourceDataObject);
226	if (lastResource != null) {	226	if (lastResource != null) {
227	FileObject sourceFile = sourceDataObject.getPrimaryFile();	227	FileObject sourceFile = sourceDataObject.getPrimaryFile();
228	FileObject bundleFile = lastResource.getPrimaryFile();	228	FileObject bundleFile = lastResource.getPrimaryFile();

Lines 44-59 Link Here

(-)a/i18n/src/org/netbeans/modules/i18n/I18nOptions.java (-3 / +58 lines)
44		44
45		45
46	import java.io.File;	46	import java.io.File;
47	import java.io.File;	47	import java.net.URL;
48	import java.util.ArrayList;	48	import java.util.ArrayList;
49	import java.util.List;	49	import java.util.List;
50	import java.util.logging.Level;	50	import java.util.logging.Level;
51	import java.util.logging.Logger;	51	import java.util.logging.Logger;
52	import java.util.prefs.Preferences;	52	import java.util.prefs.Preferences;
		53	import org.netbeans.api.java.classpath.ClassPath;
		54	import org.netbeans.api.java.queries.SourceForBinaryQuery;
53		55
54	import org.openide.filesystems.FileObject;	56	import org.openide.filesystems.FileObject;
55	import org.openide.filesystems.FileStateInvalidException;	57	import org.openide.filesystems.FileStateInvalidException;
56	import org.openide.filesystems.FileSystem;
57	import org.openide.filesystems.FileSystem;	58	import org.openide.filesystems.FileSystem;
58	import org.openide.filesystems.FileUtil;	59	import org.openide.filesystems.FileUtil;
59	import org.openide.loaders.DataObject;	60	import org.openide.loaders.DataObject;
Lines 177-185 Link Here
177	}	178	}
178		179
179	/** Getter for last resource property. */	180	/** Getter for last resource property. */
		181	@Deprecated
180	public DataObject getLastResource2() {	182	public DataObject getLastResource2() {
		183	return getLastResource2(null);
		184	}
		185
		186	/** Getter for last resource property. */
		187	public DataObject getLastResource2(DataObject srcDataObject) {
181	String path = getPreferences().get(PROP_LAST_RESOURCE2,null);	188	String path = getPreferences().get(PROP_LAST_RESOURCE2,null);
182	FileObject f = (path != null) ? findFileObject(path) : null;	189	if(path == null) {
		190	return null;
		191	}
		192	FileObject f = (srcDataObject != null) ? findFileObject(srcDataObject, path) : findFileObject(path);
183	if ((f != null) && !f.isFolder() && f.isValid()) {	193	if ((f != null) && !f.isFolder() && f.isValid()) {
184	try {	194	try {
185	return DataObject.find(f);	195	return DataObject.find(f);
Lines 224-229 Link Here
224	return retval.toArray(new FileSystem[retval.size()]);	234	return retval.toArray(new FileSystem[retval.size()]);
225	}	235	}
226		236
		237	@Deprecated
227	private static FileObject findFileObject(String path) {	238	private static FileObject findFileObject(String path) {
228	for (FileSystem fileSystem : getFileSystems()) {	239	for (FileSystem fileSystem : getFileSystems()) {
229	FileObject retval = fileSystem.findResource(path);	240	FileObject retval = fileSystem.findResource(path);
Lines 234-239 Link Here
234	return null;	245	return null;
235	}	246	}
236		247
		248	private static FileObject findFileObject(DataObject srcDataObject, String path) {
		249	FileObject pfo = srcDataObject.getPrimaryFile();
		250	ClassPath cp = ClassPath.getClassPath(pfo, ClassPath.EXECUTE);
		251
		252	for(FileObject fo : getRoots(cp)) {
		253	try {
		254	FileSystem fs = fo.getFileSystem();
		255	if (fs != null) {
		256	FileObject retval = fs.findResource(path);
		257	if (retval != null) {
		258	return retval;
		259	}
		260	}
		261	} catch (FileStateInvalidException ex) {
		262	Logger.getLogger(I18nOptions.class.getName()).log(Level.INFO, null, ex);
		263	}
		264	}
		265
		266	return null;
		267	}
		268
		269
		270	private static List<FileObject> getRoots(ClassPath cp) {
		271	ArrayList<FileObject> l = new ArrayList<FileObject>(cp.entries().size());
		272	for (ClassPath.Entry e : cp.entries()) {
		273
		274	// try to map it to sources
		275	URL url = e.getURL();
		276	SourceForBinaryQuery.Result r= SourceForBinaryQuery.findSourceRoots(url);
		277	FileObject [] fos = r.getRoots();
		278	if (fos.length > 0) {
		279	for (FileObject fo : fos) {
		280	l.add(fo);
		281	}
		282	} else {
		283	if (e.getRoot()!=null)
		284	l.add(e.getRoot()); // add the class-path location
		285	// directly
		286	}
		287	}
		288
		289	return l;
		290	}
		291
237	private static BeanNode createViewNode() throws java.beans.IntrospectionException {	292	private static BeanNode createViewNode() throws java.beans.IntrospectionException {
238	return new BeanNode(I18nOptions.getDefault());	293	return new BeanNode(I18nOptions.getDefault());
239	}	294	}

Lines 148-154 Link Here

(-)a/i18n/src/org/netbeans/modules/i18n/java/JavaI18nSupport.java (-1 / +1 lines)
148	final ResourceHolder resourceHolder	148	final ResourceHolder resourceHolder
149	= i18nString.getSupport().getResourceHolder();	149	= i18nString.getSupport().getResourceHolder();
150	if (resourceHolder.getResource() == null) {	150	if (resourceHolder.getResource() == null) {
151	DataObject lastResource = I18nUtil.getOptions().getLastResource2();	151	DataObject lastResource = I18nUtil.getOptions().getLastResource2(sourceDataObject);
152	if (lastResource != null) {	152	if (lastResource != null) {
153	FileObject sourceFile = sourceDataObject.getPrimaryFile();	153	FileObject sourceFile = sourceDataObject.getPrimaryFile();
154	FileObject bundleFile = lastResource.getPrimaryFile();	154	FileObject bundleFile = lastResource.getPrimaryFile();

Return to bug 102612

Lines 212-219 Link Here

(-)a/i18n.form/src/org/netbeans/modules/i18n/form/FormI18nMnemonicEditor.java (-4 / +4 lines)
212	if(formI18nMnemonic == null) {	212	if(formI18nMnemonic == null) {
213	formI18nMnemonic = createFormI18nMnemonic();	213	formI18nMnemonic = createFormI18nMnemonic();
214		214
215	if(I18nUtil.getOptions().getLastResource2() != null)	215	if(I18nUtil.getOptions().getLastResource2(sourceDataObject) != null)
216	formI18nMnemonic.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2());	216	formI18nMnemonic.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2(sourceDataObject));
217	}	217	}
218		218
219	return formI18nMnemonic;	219	return formI18nMnemonic;
Lines 228-235 Link Here
228	else {	228	else {
229	formI18nMnemonic = createFormI18nMnemonic();	229	formI18nMnemonic = createFormI18nMnemonic();
230		230
231	if(I18nUtil.getOptions().getLastResource2() != null)	231	if(I18nUtil.getOptions().getLastResource2(sourceDataObject) != null)
232	formI18nMnemonic.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2());	232	formI18nMnemonic.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2(sourceDataObject));
233	}	233	}
234	}	234	}
235		235

Lines 216-223 Link Here

(-)a/i18n.form/src/org/netbeans/modules/i18n/form/FormI18nIntegerEditor.java (-4 / +4 lines)
216	if(formI18nInteger == null) {	216	if(formI18nInteger == null) {
217	formI18nInteger = createFormI18nInteger();	217	formI18nInteger = createFormI18nInteger();
218		218
219	if(I18nUtil.getOptions().getLastResource2() != null)	219	if(I18nUtil.getOptions().getLastResource2(sourceDataObject) != null)
220	formI18nInteger.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2());	220	formI18nInteger.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2(sourceDataObject));
221	}	221	}
222		222
223	return formI18nInteger;	223	return formI18nInteger;
Lines 232-239 Link Here
232	else {	232	else {
233	formI18nInteger = createFormI18nInteger();	233	formI18nInteger = createFormI18nInteger();
234		234
235	if(I18nUtil.getOptions().getLastResource2() != null)	235	if(I18nUtil.getOptions().getLastResource2(sourceDataObject) != null)
236	formI18nInteger.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2());	236	formI18nInteger.getSupport().getResourceHolder().setResource(I18nUtil.getOptions().getLastResource2(sourceDataObject));
237	}	237	}
238	}	238	}
239		239