Skip to content

Commit 14449f0

Browse files
funfriedfunfried
authored
Merge pull request #204 from funfried/release/1.15.x
Release/1.15.x
2 parents 3250684 + 96c407f commit 14449f0

2 files changed

Lines changed: 142 additions & 141 deletions

File tree

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/MimeType.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"SQL=SQL"
3737
})
3838
public enum MimeType {
39-
CSS("text/css"), HTML("application/xhtml+xml", "text/html"), JAVA(JavaTokenId.language().mimeType()), JAVASCRIPT("text/javascript"), JSON("text/x-json", "^text/(.*)\\+x-json$"), XML("text/xml",
39+
// CSS("text/css"), HTML("application/xhtml+xml", "text/html"),
40+
JAVA(JavaTokenId.language().mimeType()), JAVASCRIPT("text/javascript"), JSON("text/x-json", "^text/(.*)\\+x-json$"), XML("text/xml",
4041
"^text/(.*)\\+xml$"), SQL("application/sql", "text/sql", "text/x-sql", "text/plain");
4142

4243
private final String[] mimeTypes;

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/java/eclipse/ui/EclipseJavaFormatterOptionsPanel.java‎

Lines changed: 140 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -343,177 +343,177 @@ private void formatterLocFieldFocusLost(FocusEvent evt) {//GEN-FIRST:event_forma
343343
private JLabel lblSourceLevel;
344344
// End of variables declaration//GEN-END:variables
345345

346-
private String getLinefeed() {
347-
if (0 == cbLinefeed.getSelectedIndex()) {
348-
return "";
346+
private String getLinefeed() {
347+
if (0 == cbLinefeed.getSelectedIndex()) {
348+
return "";
349+
}
350+
return cbLinefeed.getSelectedItem().toString();
349351
}
350-
return cbLinefeed.getSelectedItem().toString();
351-
}
352352

353-
/**
354-
* Returns the selected Eclipse formatter profile.
355-
*
356-
* @return the selected Eclipse formatter profile
357-
*/
358-
private String getSelectedProfile() {
359-
if (null != cbProfile.getSelectedItem()) {
360-
return cbProfile.getSelectedItem().toString();
361-
} else {
362-
return "";
353+
/**
354+
* Returns the selected Eclipse formatter profile.
355+
*
356+
* @return the selected Eclipse formatter profile
357+
*/
358+
private String getSelectedProfile() {
359+
if (null != cbProfile.getSelectedItem()) {
360+
return cbProfile.getSelectedItem().toString();
361+
} else {
362+
return "";
363+
}
363364
}
364-
}
365365

366-
private String getSourceLevel() {
367-
if (cbSourceLevel.getSelectedIndex() >= 1) {
368-
return "" + cbSourceLevel.getSelectedItem();
369-
} else {
370-
return "";
366+
private String getSourceLevel() {
367+
if (cbSourceLevel.getSelectedIndex() >= 1) {
368+
return "" + cbSourceLevel.getSelectedItem();
369+
} else {
370+
return "";
371+
}
371372
}
372-
}
373373

374-
/**
375-
* {@inheritDoc}
376-
*/
377-
@Override
378-
public void load(Preferences preferences) {
379-
String eclipseFormatterLocation = preferences.get(EclipseJavaFormatterSettings.ECLIPSE_FORMATTER_CONFIG_FILE_LOCATION, "");
380-
String eclipseFormatterProfile = preferences.get(EclipseJavaFormatterSettings.ECLIPSE_FORMATTER_ACTIVE_PROFILE, "");
381-
boolean useProjectPrefs = preferences.getBoolean(EclipseJavaFormatterSettings.USE_PROJECT_PREFS, true);
382-
String eclipseLineFeed = preferences.get(EclipseJavaFormatterSettings.LINEFEED, "");
383-
String sourceLevel = preferences.get(EclipseJavaFormatterSettings.SOURCELEVEL, "");
384-
385-
loadEclipseFormatterFileForPreview(eclipseFormatterLocation, eclipseFormatterProfile);
386-
387-
cbUseProjectPref.setSelected(useProjectPrefs);
388-
389-
if (StringUtils.isBlank(eclipseLineFeed)) {
390-
//default = system-dependend LF
391-
cbLinefeed.setSelectedIndex(0);
392-
} else {
393-
cbLinefeed.setSelectedItem(eclipseLineFeed);
394-
}
374+
/**
375+
* {@inheritDoc}
376+
*/
377+
@Override
378+
public void load(Preferences preferences) {
379+
String eclipseFormatterLocation = preferences.get(EclipseJavaFormatterSettings.ECLIPSE_FORMATTER_CONFIG_FILE_LOCATION, "");
380+
String eclipseFormatterProfile = preferences.get(EclipseJavaFormatterSettings.ECLIPSE_FORMATTER_ACTIVE_PROFILE, "");
381+
boolean useProjectPrefs = preferences.getBoolean(EclipseJavaFormatterSettings.USE_PROJECT_PREFS, true);
382+
String eclipseLineFeed = preferences.get(EclipseJavaFormatterSettings.LINEFEED, "");
383+
String sourceLevel = preferences.get(EclipseJavaFormatterSettings.SOURCELEVEL, "");
384+
385+
loadEclipseFormatterFileForPreview(eclipseFormatterLocation, eclipseFormatterProfile);
386+
387+
cbUseProjectPref.setSelected(useProjectPrefs);
388+
389+
if (StringUtils.isBlank(eclipseLineFeed)) {
390+
//default = system-dependend LF
391+
cbLinefeed.setSelectedIndex(0);
392+
} else {
393+
cbLinefeed.setSelectedItem(eclipseLineFeed);
394+
}
395+
396+
cbLinefeed.setToolTipText(Objects.toString(cbLinefeed.getSelectedItem(), null));
395397

396-
cbLinefeed.setToolTipText(Objects.toString(cbLinefeed.getSelectedItem(), null));
398+
if (StringUtils.isBlank(sourceLevel)) {
399+
//default = No override
400+
cbSourceLevel.setSelectedIndex(0);
401+
} else {
402+
cbSourceLevel.setSelectedItem(sourceLevel);
403+
}
397404

398-
if (StringUtils.isBlank(sourceLevel)) {
399-
//default = No override
400-
cbSourceLevel.setSelectedIndex(0);
401-
} else {
402-
cbSourceLevel.setSelectedItem(sourceLevel);
405+
cbSourceLevel.setToolTipText(Objects.toString(cbSourceLevel.getSelectedItem(), null));
403406
}
404407

405-
cbSourceLevel.setToolTipText(Objects.toString(cbSourceLevel.getSelectedItem(), null));
406-
}
408+
private void loadEclipseFormatterFileForPreview(String formatterFile, String activeProfile) {
409+
String filePath;
407410

408-
private void loadEclipseFormatterFileForPreview(String formatterFile, String activeProfile) {
409-
String filePath;
411+
try {
412+
URL url = new URL(formatterFile);
410413

411-
try {
412-
URL url = new URL(formatterFile);
414+
filePath = url.toString();
415+
} catch (IOException ex) {
416+
Path formatterFilePath = Paths.get(formatterFile);
417+
if (!formatterFilePath.isAbsolute() && project != null) {
418+
formatterFilePath = Paths.get(project.getProjectDirectory().getPath()).resolve(formatterFilePath);
419+
}
413420

414-
filePath = url.toString();
415-
} catch (IOException ex) {
416-
Path formatterFilePath = Paths.get(formatterFile);
417-
if (!formatterFilePath.isAbsolute() && project != null) {
418-
formatterFilePath = Paths.get(project.getProjectDirectory().getPath()).resolve(formatterFilePath);
421+
filePath = formatterFilePath.toAbsolutePath().toString();
419422
}
420423

421-
filePath = formatterFilePath.toAbsolutePath().toString();
422-
}
423-
424-
formatterLocField.setText(formatterFile);
424+
formatterLocField.setText(formatterFile);
425425

426-
cbProfile.setEnabled(false);
426+
cbProfile.setEnabled(false);
427427

428-
cbProfile.removeAllItems();
429-
cbProfile.setToolTipText(null);
428+
cbProfile.removeAllItems();
429+
cbProfile.setToolTipText(null);
430430

431-
try {
432-
//only xml configurations contain profiles
433-
if (EclipseJavaFormatterSettings.isXMLConfigurationFile(filePath)) {
434-
List<String> profileNames = ConfigReader.getProfileNames(ConfigReader.readContentFromFilePath(filePath));
435-
cbProfile.addItem(NbBundle.getMessage(EclipseJavaFormatterOptionsPanel.class, "EclipseJavaFormatterOptionsPanel.chooseProfile"));
431+
try {
432+
//only xml configurations contain profiles
433+
if (EclipseJavaFormatterSettings.isXMLConfigurationFile(filePath)) {
434+
List<String> profileNames = ConfigReader.getProfileNames(ConfigReader.readContentFromFilePath(filePath));
435+
cbProfile.addItem(NbBundle.getMessage(EclipseJavaFormatterOptionsPanel.class, "EclipseJavaFormatterOptionsPanel.chooseProfile"));
436436

437-
String entryToSelect = null;
438-
for (String profileName : profileNames) {
439-
cbProfile.addItem(profileName);
440-
if (activeProfile != null && activeProfile.equals(profileName)) {
441-
entryToSelect = profileName;
437+
String entryToSelect = null;
438+
for (String profileName : profileNames) {
439+
cbProfile.addItem(profileName);
440+
if (activeProfile != null && activeProfile.equals(profileName)) {
441+
entryToSelect = profileName;
442+
}
442443
}
444+
selectProfileOrFallback(entryToSelect, profileNames);
445+
cbProfile.setEnabled(true);
443446
}
444-
selectProfileOrFallback(entryToSelect, profileNames);
445-
cbProfile.setEnabled(true);
446-
}
447447

448-
formatterLocField.setToolTipText(filePath);
449-
} catch (IOException | SAXException | ConfigReadException ex) {
450-
log.log(Level.INFO, "Could not parse formatter config", ex);
448+
formatterLocField.setToolTipText(filePath);
449+
} catch (IOException | SAXException | ConfigReadException ex) {
450+
log.log(Level.INFO, "Could not parse formatter config", ex);
451+
}
451452
}
452-
}
453453

454-
private void selectProfileOrFallback(String entryToSelect, List<String> profiles) {
455-
if (null != entryToSelect) {
456-
cbProfile.setSelectedItem(entryToSelect);
457-
} else if (profiles.size() == 1) {
458-
//only one entry (excl. default) -> choose the only valid item
459-
cbProfile.setSelectedIndex(1);
460-
} else {
461-
//fallback: ===choose profile==
462-
cbProfile.setSelectedIndex(0);
463-
}
454+
private void selectProfileOrFallback(String entryToSelect, List<String> profiles) {
455+
if (null != entryToSelect) {
456+
cbProfile.setSelectedItem(entryToSelect);
457+
} else if (profiles.size() == 1) {
458+
//only one entry (excl. default) -> choose the only valid item
459+
cbProfile.setSelectedIndex(1);
460+
} else {
461+
//fallback: ===choose profile==
462+
cbProfile.setSelectedIndex(0);
463+
}
464464

465-
cbProfile.setToolTipText(Objects.toString(cbProfile.getSelectedItem(), null));
466-
}
465+
cbProfile.setToolTipText(Objects.toString(cbProfile.getSelectedItem(), null));
466+
}
467467

468-
/**
469-
* {@inheritDoc}
470-
*/
471-
@Override
472-
public void store(Preferences preferences) {
473-
preferences.put(EclipseJavaFormatterSettings.ECLIPSE_FORMATTER_CONFIG_FILE_LOCATION, formatterLocField.getText());
474-
preferences.put(EclipseJavaFormatterSettings.ECLIPSE_FORMATTER_ACTIVE_PROFILE, getSelectedProfile());
475-
preferences.putBoolean(EclipseJavaFormatterSettings.USE_PROJECT_PREFS, cbUseProjectPref.isSelected());
476-
preferences.put(EclipseJavaFormatterSettings.LINEFEED, getLinefeed());
477-
preferences.put(EclipseJavaFormatterSettings.SOURCELEVEL, getSourceLevel());
478-
}
468+
/**
469+
* {@inheritDoc}
470+
*/
471+
@Override
472+
public void store(Preferences preferences) {
473+
preferences.put(EclipseJavaFormatterSettings.ECLIPSE_FORMATTER_CONFIG_FILE_LOCATION, formatterLocField.getText());
474+
preferences.put(EclipseJavaFormatterSettings.ECLIPSE_FORMATTER_ACTIVE_PROFILE, getSelectedProfile());
475+
preferences.putBoolean(EclipseJavaFormatterSettings.USE_PROJECT_PREFS, cbUseProjectPref.isSelected());
476+
preferences.put(EclipseJavaFormatterSettings.LINEFEED, getLinefeed());
477+
preferences.put(EclipseJavaFormatterSettings.SOURCELEVEL, getSourceLevel());
478+
}
479479

480-
/**
481-
* {@inheritDoc}
482-
*/
483-
@Override
484-
public boolean valid() {
485-
errorLabel.setText("");
486-
487-
String fileName = formatterLocField.getText();
488-
if (StringUtils.isBlank(fileName) && cbUseProjectPref.isSelected()) {
489-
// use configuration from .settings
490-
return true;
491-
} else if (StringUtils.isNotBlank(fileName) && project != null) {
492-
Path formatterFilePath = Paths.get(fileName);
493-
if (!formatterFilePath.isAbsolute()) {
494-
fileName = Paths.get(project.getProjectDirectory().getPath()).resolve(formatterFilePath).toString();
480+
/**
481+
* {@inheritDoc}
482+
*/
483+
@Override
484+
public boolean valid() {
485+
errorLabel.setText("");
486+
487+
String fileName = formatterLocField.getText();
488+
if (StringUtils.isBlank(fileName) && cbUseProjectPref.isSelected()) {
489+
// use configuration from .settings
490+
return true;
491+
} else if (StringUtils.isNotBlank(fileName) && project != null) {
492+
Path formatterFilePath = Paths.get(fileName);
493+
if (!formatterFilePath.isAbsolute()) {
494+
fileName = Paths.get(project.getProjectDirectory().getPath()).resolve(formatterFilePath).toString();
495+
}
495496
}
496-
}
497497

498-
boolean fileExists;
499-
try {
500-
new URL(formatterLocField.getText());
498+
boolean fileExists;
499+
try {
500+
new URL(formatterLocField.getText());
501501

502-
fileName = formatterLocField.getText();
503-
fileExists = true;
504-
} catch (IOException ex) {
505-
fileExists = new File(fileName).exists();
506-
}
502+
fileName = formatterLocField.getText();
503+
fileExists = true;
504+
} catch (IOException ex) {
505+
fileExists = new File(fileName).exists();
506+
}
507507

508-
boolean isXML = EclipseJavaFormatterSettings.isXMLConfigurationFile(fileName);
509-
boolean isEPF = EclipseJavaFormatterSettings.isWorkspaceMechanicFile(fileName);
510-
boolean isProjectSetting = EclipseJavaFormatterSettings.isProjectSetting(fileName);
508+
boolean isXML = EclipseJavaFormatterSettings.isXMLConfigurationFile(fileName);
509+
boolean isEPF = EclipseJavaFormatterSettings.isWorkspaceMechanicFile(fileName);
510+
boolean isProjectSetting = EclipseJavaFormatterSettings.isProjectSetting(fileName);
511511

512-
if (!fileExists || (!isXML && !isEPF && !isProjectSetting) || cbProfile.getSelectedIndex() < 0) {
513-
errorLabel.setText("Invalid file. Please enter a valid configuration file.");
514-
return false;
515-
} else {
516-
return !isXML || cbProfile.getSelectedIndex() != 0;
512+
if (!fileExists || (!isXML && !isEPF && !isProjectSetting) || (isXML && cbProfile.getSelectedIndex() < 0)) {
513+
errorLabel.setText("Invalid file. Please enter a valid configuration file.");
514+
return false;
515+
} else {
516+
return !isXML || cbProfile.getSelectedIndex() != 0;
517+
}
517518
}
518519
}
519-
}

0 commit comments

Comments
 (0)