Lines 44-49
import java.io.CharConversionException;
Link Here
|
44 |
import java.io.CharConversionException; |
44 |
import java.io.CharConversionException; |
45 |
import java.io.File; |
45 |
import java.io.File; |
46 |
import java.io.IOException; |
46 |
import java.io.IOException; |
|
|
47 |
import java.net.MalformedURLException; |
48 |
import java.net.URL; |
47 |
import java.util.ArrayList; |
49 |
import java.util.ArrayList; |
48 |
import java.util.Arrays; |
50 |
import java.util.Arrays; |
49 |
import java.util.Collections; |
51 |
import java.util.Collections; |
Lines 65-70
import org.openide.loaders.DataFolder;
Link Here
|
65 |
import org.openide.loaders.DataFolder; |
67 |
import org.openide.loaders.DataFolder; |
66 |
import org.openide.loaders.DataObject; |
68 |
import org.openide.loaders.DataObject; |
67 |
import org.openide.modules.SpecificationVersion; |
69 |
import org.openide.modules.SpecificationVersion; |
|
|
70 |
import org.openide.util.Exceptions; |
68 |
import org.openide.util.NbBundle; |
71 |
import org.openide.util.NbBundle; |
69 |
import org.openide.xml.XMLUtil; |
72 |
import org.openide.xml.XMLUtil; |
70 |
|
73 |
|
Lines 178-183
final class NewLoaderIterator extends Ba
Link Here
|
178 |
|
181 |
|
179 |
public static void generateFileChanges(DataModel model) { |
182 |
public static void generateFileChanges(DataModel model) { |
180 |
CreatedModifiedFiles fileChanges = new CreatedModifiedFiles(model.getProject()); |
183 |
CreatedModifiedFiles fileChanges = new CreatedModifiedFiles(model.getProject()); |
|
|
184 |
|
185 |
boolean loaderlessObject; |
186 |
boolean lookupReadyObject; |
187 |
try { |
188 |
SpecificationVersion current = model.getModuleInfo().getDependencyVersion("org.openide.loaders"); |
189 |
loaderlessObject = current.compareTo(new SpecificationVersion("7.1")) >= 0; // NOI18N |
190 |
lookupReadyObject = current.compareTo(new SpecificationVersion("6.0")) >= 0; // NOI18N |
191 |
} catch (IOException ex) { |
192 |
Logger.getLogger(NewLoaderIterator.class.getName()).log(Level.INFO, null, ex); |
193 |
loaderlessObject = false; |
194 |
lookupReadyObject = false; |
195 |
} |
181 |
|
196 |
|
182 |
String namePrefix = model.getPrefix(); |
197 |
String namePrefix = model.getPrefix(); |
183 |
String packageName = model.getPackageName(); |
198 |
String packageName = model.getPackageName(); |
Lines 191-216
final class NewLoaderIterator extends Ba
Link Here
|
191 |
|
206 |
|
192 |
// Copy action icon |
207 |
// Copy action icon |
193 |
String origIconPath = model.getIconPath(); |
208 |
String origIconPath = model.getIconPath(); |
|
|
209 |
String relativeIconPath; |
194 |
if (origIconPath != null && new File(origIconPath).exists()) { |
210 |
if (origIconPath != null && new File(origIconPath).exists()) { |
195 |
String relativeIconPath = model.addCreateIconOperation(fileChanges, origIconPath); |
211 |
relativeIconPath = model.addCreateIconOperation(fileChanges, origIconPath); |
196 |
replaceTokens.put("IMAGESNIPPET", formatImageSnippet(relativeIconPath));//NOI18N |
212 |
replaceTokens.put("IMAGESNIPPET", formatImageSnippet(relativeIconPath));//NOI18N |
197 |
replaceTokens.put("ICONPATH", relativeIconPath);//NOI18N |
213 |
replaceTokens.put("ICONPATH", relativeIconPath);//NOI18N |
198 |
replaceTokens.put("COMMENTICON", "");//NOI18N |
214 |
replaceTokens.put("COMMENTICON", "");//NOI18N |
199 |
|
|
|
200 |
} else { |
215 |
} else { |
201 |
replaceTokens.put("IMAGESNIPPET", formatImageSnippet(null)); //NOI18N |
216 |
replaceTokens.put("IMAGESNIPPET", formatImageSnippet(null)); //NOI18N |
202 |
replaceTokens.put("ICONPATH", "SET/PATH/TO/ICON/HERE"); //NOI18N |
217 |
replaceTokens.put("ICONPATH", "SET/PATH/TO/ICON/HERE"); //NOI18N |
203 |
replaceTokens.put("COMMENTICON", "//");//NOI18N |
218 |
replaceTokens.put("COMMENTICON", "//");//NOI18N |
|
|
219 |
relativeIconPath = null; |
204 |
} |
220 |
} |
205 |
|
221 |
|
206 |
// 1. create dataloader file |
222 |
FileObject template; |
207 |
String loaderName = model.getDefaultPackagePath(namePrefix + "DataLoader.java", false); // NOI18N |
223 |
if (!loaderlessObject) { |
208 |
// XXX use nbresloc URL protocol rather than NewLoaderIterator.class.getResource(...): |
224 |
// 1. create dataloader file |
209 |
FileObject template = CreatedModifiedFiles.getTemplate("templateDataLoader.java");//NOI18N |
225 |
String loaderName = model.getDefaultPackagePath(namePrefix + "DataLoader.java", false); // NOI18N |
210 |
fileChanges.add(fileChanges.createFileWithSubstitutions(loaderName, template, replaceTokens)); |
226 |
// XXX use nbresloc URL protocol rather than NewLoaderIterator.class.getResource(...): |
211 |
String loaderInfoName = model.getDefaultPackagePath(namePrefix + "DataLoaderBeanInfo.java", false); // NOI18N |
227 |
template = CreatedModifiedFiles.getTemplate("templateDataLoader.java");//NOI18N |
212 |
template = CreatedModifiedFiles.getTemplate("templateDataLoaderBeanInfo.java");//NOI18N |
228 |
fileChanges.add(fileChanges.createFileWithSubstitutions(loaderName, template, replaceTokens)); |
213 |
fileChanges.add(fileChanges.createFileWithSubstitutions(loaderInfoName, template, replaceTokens)); |
229 |
String loaderInfoName = model.getDefaultPackagePath(namePrefix + "DataLoaderBeanInfo.java", false); // NOI18N |
|
|
230 |
template = CreatedModifiedFiles.getTemplate("templateDataLoaderBeanInfo.java");//NOI18N |
231 |
fileChanges.add(fileChanges.createFileWithSubstitutions(loaderInfoName, template, replaceTokens)); |
232 |
} |
214 |
|
233 |
|
215 |
// 2. dataobject file |
234 |
// 2. dataobject file |
216 |
final boolean isEditable = Pattern.matches("(application/([a-zA-Z0-9_.-])*\\+xml|text/([a-zA-Z0-9_.+-])*)", //NOI18N |
235 |
final boolean isEditable = Pattern.matches("(application/([a-zA-Z0-9_.-])*\\+xml|text/([a-zA-Z0-9_.+-])*)", //NOI18N |
Lines 229-252
final class NewLoaderIterator extends Ba
Link Here
|
229 |
|
248 |
|
230 |
String doName = model.getDefaultPackagePath(namePrefix + "DataObject.java", false); // NOI18N |
249 |
String doName = model.getDefaultPackagePath(namePrefix + "DataObject.java", false); // NOI18N |
231 |
template = null; |
250 |
template = null; |
232 |
try { |
251 |
if (loaderlessObject) { |
233 |
SpecificationVersion current = model.getModuleInfo().getDependencyVersion("org.openide.loaders"); |
252 |
template = CreatedModifiedFiles.getTemplate("templateDataObjectInLayer.java");//NOI18N |
234 |
SpecificationVersion desired = new SpecificationVersion("6.0"); // NOI18N |
253 |
} else { |
235 |
if (current.compareTo(desired) >= 0) { |
254 |
if (lookupReadyObject) { |
236 |
template = CreatedModifiedFiles.getTemplate("templateDataObjectWithLookup.java");//NOI18N |
255 |
template = CreatedModifiedFiles.getTemplate("templateDataObjectWithLookup.java");//NOI18N |
237 |
} |
256 |
} |
238 |
} catch (IOException ex) { |
|
|
239 |
Logger.getLogger(NewLoaderIterator.class.getName()).log(Level.INFO, null, ex); |
240 |
} |
257 |
} |
241 |
if (template == null) { |
258 |
if (template == null) { |
242 |
template = CreatedModifiedFiles.getTemplate("templateDataObject.java");//NOI18N |
259 |
template = CreatedModifiedFiles.getTemplate("templateDataObject.java");//NOI18N |
243 |
} |
260 |
} |
244 |
fileChanges.add(fileChanges.createFileWithSubstitutions(doName, template, replaceTokens)); |
261 |
fileChanges.add(fileChanges.createFileWithSubstitutions(doName, template, replaceTokens)); |
245 |
|
262 |
|
246 |
// 3. node file |
263 |
if (!loaderlessObject) { |
247 |
String nodeName = model.getDefaultPackagePath(namePrefix + "DataNode.java", false); // NOI18N |
264 |
// 3. node file |
248 |
template = CreatedModifiedFiles.getTemplate("templateDataNode.java");//NOI18N |
265 |
String nodeName = model.getDefaultPackagePath(namePrefix + "DataNode.java", false); // NOI18N |
249 |
fileChanges.add(fileChanges.createFileWithSubstitutions(nodeName, template, replaceTokens)); |
266 |
template = CreatedModifiedFiles.getTemplate("templateDataNode.java");//NOI18N |
|
|
267 |
fileChanges.add(fileChanges.createFileWithSubstitutions(nodeName, template, replaceTokens)); |
268 |
} |
250 |
|
269 |
|
251 |
// 4. mimetyperesolver file |
270 |
// 4. mimetyperesolver file |
252 |
template = CreatedModifiedFiles.getTemplate("templateresolver.xml");//NOI18N |
271 |
template = CreatedModifiedFiles.getTemplate("templateresolver.xml");//NOI18N |
Lines 273-290
final class NewLoaderIterator extends Ba
Link Here
|
273 |
fileChanges.add(fileChanges.bundleKey(bundlePath, "LBL_" + namePrefix + "_loader_name", // NOI18N |
292 |
fileChanges.add(fileChanges.bundleKey(bundlePath, "LBL_" + namePrefix + "_loader_name", // NOI18N |
274 |
NbBundle.getMessage(NewLoaderIterator.class, "LBL_LoaderName", namePrefix))); //NOI18N |
293 |
NbBundle.getMessage(NewLoaderIterator.class, "LBL_LoaderName", namePrefix))); //NOI18N |
275 |
|
294 |
|
276 |
// 7. register manifest entry |
295 |
if (loaderlessObject) { |
277 |
boolean isXml = Pattern.matches("(application/([a-zA-Z0-9_.-])*\\+xml|text/([a-zA-Z0-9_.-])*\\+xml)", //NOI18N |
296 |
// 7. register in layer |
278 |
mime); |
297 |
String path = "Loaders/" + mime + "/Factories/" + namePrefix + "DataLoader.instance"; |
279 |
String installBefore = null; |
298 |
Map<String,Object> attrs = new HashMap<String, Object>(); |
280 |
if (isXml) { |
299 |
attrs.put("instanceCreate", "methodvalue:org.openide.loaders.DataLoaderPool.factory"); //NOI18N |
281 |
installBefore = "org.openide.loaders.XMLDataObject, org.netbeans.modules.xml.XMLDataObject"; //NOI18N |
300 |
attrs.put("dataObjectClass", packageName + "." + namePrefix + "DataObject"); //NOI18N |
|
|
301 |
attrs.put("mimeType", mime); //NOI18N |
302 |
if (relativeIconPath != null) { |
303 |
try { |
304 |
URL url = new URL("nbresloc:/" + relativeIconPath); //NOI18N |
305 |
attrs.put("SystemFileSystem.icon", url); //NOI18N |
306 |
} catch (MalformedURLException ex) { |
307 |
throw new IllegalStateException(ex); |
308 |
} |
309 |
} |
310 |
fileChanges.add( |
311 |
fileChanges.createLayerEntry(path, null, null, null, attrs) |
312 |
); |
313 |
} else { |
314 |
// 7. register manifest entry |
315 |
boolean isXml = Pattern.matches("(application/([a-zA-Z0-9_.-])*\\+xml|text/([a-zA-Z0-9_.-])*\\+xml)", //NOI18N |
316 |
mime); |
317 |
String installBefore = null; |
318 |
if (isXml) { |
319 |
installBefore = "org.openide.loaders.XMLDataObject, org.netbeans.modules.xml.XMLDataObject"; //NOI18N |
320 |
} |
321 |
|
322 |
fileChanges.add(fileChanges.addLoaderSection(packageName.replace('.', '/') + "/" + namePrefix + "DataLoader", installBefore)); // NOI18N |
323 |
|
324 |
// 7a. create matching test registration for convenience (#73202) |
325 |
fileChanges.add(fileChanges.addLookupRegistration("org.openide.loaders.DataLoader", packageName + '.' + namePrefix + "DataLoader", true)); // NOI18N |
282 |
} |
326 |
} |
283 |
|
|
|
284 |
fileChanges.add(fileChanges.addLoaderSection(packageName.replace('.', '/') + "/" + namePrefix + "DataLoader", installBefore)); // NOI18N |
285 |
|
286 |
// 7a. create matching test registration for convenience (#73202) |
287 |
fileChanges.add(fileChanges.addLookupRegistration("org.openide.loaders.DataLoader", packageName + '.' + namePrefix + "DataLoader", true)); // NOI18N |
288 |
|
327 |
|
289 |
//8. create layerfile actions subsection |
328 |
//8. create layerfile actions subsection |
290 |
|
329 |
|