Skip to content

Property-Files: use native encoding by default and allow project/IDE wide configuration #9748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthiasblaesing wants to merge 5 commits into
base: master
Choose a base branch
from
+1,460 −847
Open

Property-Files: use native encoding by default and allow project/IDE wide configuration #9748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49801f1
Fix/reenabled testes for ide/properties
matthiasblaesing Oct 24, 2026
cd2f516
General cleanup for PropertiesEditorSupport/PropertiesEncoding
matthiasblaesing Oct 21, 2026
5210b10
Simplify PropCharset by removing association with the FileObject
matthiasblaesing Oct 22, 2026
6f0624d
Remove no-op methods from UtilConvert
matthiasblaesing Oct 22, 2026
dd250ab
Property-Files: use native encoding by default and allow project/IDE …
matthiasblaesing Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,9 @@ jobs:
- name: ide/projectui
run: ant $OPTS -f ide/projectui test

- name: ide/properties
run: ant $OPTS -f ide/properties test

- name: ide/refactoring.api
run: ant $OPTS -f ide/refactoring.api test

Expand Down
1 change: 1 addition & 0 deletions ide/options.editor/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@
<friend>org.netbeans.modules.php.editor</friend>
<friend>org.netbeans.modules.php.project</friend>
<friend>org.netbeans.modules.php.twig</friend>
<friend>org.netbeans.modules.properties</friend>
<friend>org.netbeans.modules.python.editor</friend>
<friend>org.netbeans.modules.python.source</friend>
<friend>org.netbeans.modules.ruby</friend>
Expand Down
13 changes: 2 additions & 11 deletions ide/properties/nbproject/org-netbeans-modules-properties.sig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Signature file v4.1
#Version 1.88
#Version 1.90

CLSS public abstract java.awt.Component
cons protected init()
Expand Down Expand Up @@ -1241,7 +1241,7 @@ meth public void open()
meth public void saveAs(org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
supr org.openide.text.CloneableEditorSupport
hfds LOG,charset,fsStatusListener,myEntry,serialVersionUID
hcls Env,Environment,EnvironmentListener,FsStatusListener,PropertiesEditorLookup,SaveImpl,StampFlag,UndoRedoStampFlagManager
hcls Environment,EnvironmentListener,FsStatusListener,PropertiesEditorLookup,SaveImpl,StampFlag,UndoRedoStampFlagManager

CLSS public org.netbeans.modules.properties.PropertiesEditorSupport$PropertiesEditAt
outer org.netbeans.modules.properties.PropertiesEditorSupport
Expand Down Expand Up @@ -1520,16 +1520,7 @@ CLSS public org.netbeans.modules.properties.UtilConvert
fld public final static java.lang.String keyValueSeparators = "=: \u0009\r\n\u000c"
fld public final static java.lang.String strictKeyValueSeparators = "=:"
fld public final static java.lang.String whiteSpaceChars = " \u0009\r\n\u000c"
meth public static java.lang.String charsToUnicodes(java.lang.String)
meth public static java.lang.String charsToUnicodes(java.lang.String,boolean)
meth public static java.lang.String escapeComment(java.lang.String)
meth public static java.lang.String escapeJavaSpecialChars(java.lang.String)
meth public static java.lang.String escapeLineContinuationChar(java.lang.String)
meth public static java.lang.String escapeOutsideSpaces(java.lang.String)
meth public static java.lang.String escapePropertiesSpecialChars(java.lang.String)
meth public static java.lang.String loadConvert(java.lang.String)
meth public static java.lang.String saveConvert(java.lang.String)
meth public static java.lang.String unicodesToChars(java.lang.String)
supr java.lang.Object
hfds hexDigit,specialSaveChars

Expand Down
54 changes: 49 additions & 5 deletions ide/properties/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,50 @@
<specification-version>1.25</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.editor</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>3</release-version>
<specification-version>1.122</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.editor.document</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.44</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.editor.indent</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>2</release-version>
<specification-version>1.78</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.editor.settings</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.92</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.options.editor</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.96</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.queries</code-name-base>
<build-prerequisite/>
Expand Down Expand Up @@ -100,27 +144,27 @@
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.util.ui</code-name-base>
<code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>9.3</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.util</code-name-base>
<code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>9.3</specification-version>
<specification-version>8.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.util.lookup</code-name-base>
<code-name-base>org.openide.util.ui</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>8.0</specification-version>
<specification-version>9.3</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
16 changes: 16 additions & 0 deletions ide/properties/src/org/netbeans/modules/properties/Layer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,20 @@
</folder>
</folder>
</folder>

<folder name="OptionsDialog">
<folder name="Editor">
<folder name="Formatting">
<attr name="position" intvalue="0"/>
<folder name="text">
<folder name="x-properties">
<file name="Encoding.instance">
<attr name="instanceOf" stringvalue="org.netbeans.modules.options.editor.spi.PreferencesCustomizer$Factory"/>
<attr name="instanceCreate" methodvalue="org.netbeans.modules.properties.formatter.FmtEncoding.getController"/>
</file>
</folder>
</folder>
</folder>
</folder>
</folder>
</filesystem>
20 changes: 16 additions & 4 deletions ide/properties/src/org/netbeans/modules/properties/PropertiesDataNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,23 @@ public ProjectEncodingProperty() {
}

@Override
public Object getValue() throws InvocationTargetException {
public boolean isDefaultValue() {
return getValue() == null;
}

@Override
public void restoreDefaultValue() throws IllegalAccessException, InvocationTargetException {
setValue(null);
}

@Override
public boolean supportsDefaultValue() {
return true;
}

@Override
public Object getValue() {
Object attribute = getDataObject().getPrimaryFile().getAttribute(PROPERTY_ENCODING);
if (attribute == null) {
return false;
}
return attribute;
}

Expand Down
Loading
Loading