Switch SVG loading from the Batik library to JSVG#7941

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

Merged
eirikbakke merged 1 commit into from
Nov 16, 2024
Merged

Switch SVG loading from the Batik library to JSVG #7941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions nbbuild/cluster.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,7 @@ nb.cluster.platform=\
libs.jna,\
libs.jna.platform,\
libs.jsr223,\
libs.jsvg,\
libs.junit4,\
libs.junit5,\
libs.osgi,\
Expand Down
21 changes: 21 additions & 0 deletions nbbuild/licenses/MIT-jsvg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions nbbuild/licenses/names.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,7 @@ MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MIT-vscode=MIT license for VSCode
MIT-vscode-ext=MIT license VS Code variant
MIT-jsvg=MIT license JSVG variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
W3C2=W3C Software and Document Notice and License
Expand Down
29 changes: 29 additions & 0 deletions platform/libs.jsvg/build.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->

<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="platform/libs.jsvg" default="build" basedir=".">
<description>Builds the JSVG library wrapper module.</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
18 changes: 18 additions & 0 deletions platform/libs.jsvg/external/binaries-list
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

A84D34480044DB51A1448E9C0E32BD284B797288 com.github.weisj:jsvg:1.6.1
29 changes: 29 additions & 0 deletions platform/libs.jsvg/external/jsvg-1.6.1-license.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
Name: JSVG
Version: 1.6.1
Description: JSVG - A Java SVG implementation
License: MIT-jsvg
Origin: JSVG
URL: https://github.com/weisJ/jsvg
Files: jsvg-1.6.1.jar

MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
5 changes: 5 additions & 0 deletions platform/libs.jsvg/manifest.mf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsvg
OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsvg/Bundle.properties
AutoUpdate-Show-In-Client: false
26 changes: 26 additions & 0 deletions platform/libs.jsvg/nbproject/project.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

file.reference.jsvg-1.6.1.jar=external/jsvg-1.6.1.jar
release.external/jsvg-1.6.1.jar=modules/ext/jsvg-1.6.1.jar

is.autoload=true
javac.source=1.8

nbm.homepage=https://github.com/weisJ/jsvg
sigtest.gen.fail.on.error=false
spec.version.base=1.22.0
64 changes: 64 additions & 0 deletions platform/libs.jsvg/nbproject/project.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
<code-name-base>org.netbeans.libs.jsvg</code-name-base>
<module-dependencies/>
<public-packages>
<package>com.github.weisj.jsvg</package>
<package>com.github.weisj.jsvg.attributes</package>
<package>com.github.weisj.jsvg.attributes.filter</package>
<package>com.github.weisj.jsvg.attributes.font</package>
<package>com.github.weisj.jsvg.attributes.paint</package>
<package>com.github.weisj.jsvg.attributes.stroke</package>
<package>com.github.weisj.jsvg.attributes.text</package>
<package>com.github.weisj.jsvg.geometry</package>
<package>com.github.weisj.jsvg.geometry.mesh</package>
<package>com.github.weisj.jsvg.geometry.noise</package>
<package>com.github.weisj.jsvg.geometry.path</package>
<package>com.github.weisj.jsvg.geometry.size</package>
<package>com.github.weisj.jsvg.geometry.util</package>
<package>com.github.weisj.jsvg.nodes</package>
<package>com.github.weisj.jsvg.nodes.animation</package>
<package>com.github.weisj.jsvg.nodes.container</package>
<package>com.github.weisj.jsvg.nodes.filter</package>
<package>com.github.weisj.jsvg.nodes.mesh</package>
<package>com.github.weisj.jsvg.nodes.prototype</package>
<package>com.github.weisj.jsvg.nodes.prototype.spec</package>
<package>com.github.weisj.jsvg.nodes.text</package>
<package>com.github.weisj.jsvg.parser</package>
<package>com.github.weisj.jsvg.parser.css</package>
<package>com.github.weisj.jsvg.parser.resources</package>
<package>com.github.weisj.jsvg.renderer</package>
<package>com.github.weisj.jsvg.renderer.awt</package>
<package>com.github.weisj.jsvg.renderer.jdk</package>
<package>com.github.weisj.jsvg.util</package>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/jsvg-1.6.1.jar</runtime-relative-path>
<binary-origin>external/jsvg-1.6.1.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
</project>
22 changes: 22 additions & 0 deletions platform/libs.jsvg/src/org/netbeans/libs/jsvg/Bundle.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.


OpenIDE-Module-Name=JSVG Library
OpenIDE-Module-Short-Description=JSVG Library
OpenIDE-Module-Long-Description=Contains the JSVG library, for reading and painting SVG files.
OpenIDE-Module-Display-Category=Libraries
2 changes: 1 addition & 1 deletion platform/openide.util.ui.svg/nbproject/project.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
<code-name-base>org.openide.util.ui.svg</code-name-base>
<module-dependencies>
<dependency>
<code-name-base>org.netbeans.libs.batik.read</code-name-base>
<code-name-base>org.netbeans.libs.jsvg</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
Expand Down
59 changes: 59 additions & 0 deletions platform/openide.util.ui.svg/src/org/openide/util/svg/DenyingElementLoader.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.openide.util.svg;

import com.github.weisj.jsvg.attributes.AttributeParser;
import com.github.weisj.jsvg.parser.ElementLoader;
import com.github.weisj.jsvg.parser.ParsedDocument;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

class DenyingElementLoader implements ElementLoader {
private final Set<String> attemptedExternalURLsLoaded = new LinkedHashSet<>();

public Set<String> getAttemptedExternalURLsLoaded() {
return Collections.unmodifiableSet(attemptedExternalURLsLoaded);
}

@Override
public <T> T loadElement(Class<T> type, String value,
ParsedDocument document, AttributeParser attributeParser)
{
/* Same logic as in com.github.weisj.jsvg.parser.DefaultElementLoader for the
AllowExternalResources.DENY case, but gathering up the attempted externally loaded URLs so
we can make the whole loading operation fail and make testLoadImageWithExternalUseXlinkHref
pass. */
String url = attributeParser.parseUrl(value);
if (url == null) {
return null;
}
if (url.contains("#")) {
String[] parts = url.split("#", 2);
String name = parts[0];
if (!name.isEmpty()) {
attemptedExternalURLsLoaded.add(value);
return null;
}
return document.getElementById(type, parts[1]);
} else {
return document.getElementById(type, url);
Comment thread
matthiasblaesing marked this conversation as resolved.
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Switch SVG loading from the Batik library to JSVG#7941

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

 Merged

eirikbakke
merged 1 commit into

from

Nov 16, 2024
 Merged


Switch SVG loading from the Batik library to JSVG
#7941
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
nbbuild/cluster.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,7 @@ nb.cluster.platform=\
 libs.jna,\
 libs.jna.platform,\
 libs.jsr223,\
 libs.jsvg,\
 libs.junit4,\
 libs.junit5,\
 libs.osgi,\
Expand Down

21 changes: 21 additions & 0 deletions
nbbuild/licenses/MIT-jsvg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

1 change: 1 addition & 0 deletions
nbbuild/licenses/names.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,7 @@ MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MIT-vscode=MIT license for VSCode
MIT-vscode-ext=MIT license VS Code variant
MIT-jsvg=MIT license JSVG variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
W3C2=W3C Software and Document Notice and License
Expand Down

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/build.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->

<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="platform/libs.jsvg" default="build" basedir=".">
 <description>Builds the JSVG library wrapper module.</description>
 <import file="../../nbbuild/templates/projectized.xml"/>
</project>

18 changes: 18 additions & 0 deletions
platform/libs.jsvg/external/binaries-list

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

A84D34480044DB51A1448E9C0E32BD284B797288 com.github.weisj:jsvg:1.6.1

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/external/jsvg-1.6.1-license.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
Name: JSVG
Version: 1.6.1
Description: JSVG - A Java SVG implementation
License: MIT-jsvg
Origin: JSVG
URL: https://github.com/weisJ/jsvg
Files: jsvg-1.6.1.jar

MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5 changes: 5 additions & 0 deletions
platform/libs.jsvg/manifest.mf

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsvg
OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsvg/Bundle.properties
AutoUpdate-Show-In-Client: false

26 changes: 26 additions & 0 deletions
platform/libs.jsvg/nbproject/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

file.reference.jsvg-1.6.1.jar=external/jsvg-1.6.1.jar
release.external/jsvg-1.6.1.jar=modules/ext/jsvg-1.6.1.jar

is.autoload=true
javac.source=1.8

nbm.homepage=https://github.com/weisJ/jsvg
sigtest.gen.fail.on.error=false
spec.version.base=1.22.0

64 changes: 64 additions & 0 deletions
platform/libs.jsvg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
 <type>org.netbeans.modules.apisupport.project</type>
 <configuration>
 <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <module-dependencies/>
 <public-packages>
 <package>com.github.weisj.jsvg</package>
 <package>com.github.weisj.jsvg.attributes</package>
 <package>com.github.weisj.jsvg.attributes.filter</package>
 <package>com.github.weisj.jsvg.attributes.font</package>
 <package>com.github.weisj.jsvg.attributes.paint</package>
 <package>com.github.weisj.jsvg.attributes.stroke</package>
 <package>com.github.weisj.jsvg.attributes.text</package>
 <package>com.github.weisj.jsvg.geometry</package>
 <package>com.github.weisj.jsvg.geometry.mesh</package>
 <package>com.github.weisj.jsvg.geometry.noise</package>
 <package>com.github.weisj.jsvg.geometry.path</package>
 <package>com.github.weisj.jsvg.geometry.size</package>
 <package>com.github.weisj.jsvg.geometry.util</package>
 <package>com.github.weisj.jsvg.nodes</package>
 <package>com.github.weisj.jsvg.nodes.animation</package>
 <package>com.github.weisj.jsvg.nodes.container</package>
 <package>com.github.weisj.jsvg.nodes.filter</package>
 <package>com.github.weisj.jsvg.nodes.mesh</package>
 <package>com.github.weisj.jsvg.nodes.prototype</package>
 <package>com.github.weisj.jsvg.nodes.prototype.spec</package>
 <package>com.github.weisj.jsvg.nodes.text</package>
 <package>com.github.weisj.jsvg.parser</package>
 <package>com.github.weisj.jsvg.parser.css</package>
 <package>com.github.weisj.jsvg.parser.resources</package>
 <package>com.github.weisj.jsvg.renderer</package>
 <package>com.github.weisj.jsvg.renderer.awt</package>
 <package>com.github.weisj.jsvg.renderer.jdk</package>
 <package>com.github.weisj.jsvg.util</package>
 </public-packages>
 <class-path-extension>
 <runtime-relative-path>ext/jsvg-1.6.1.jar</runtime-relative-path>
 <binary-origin>external/jsvg-1.6.1.jar</binary-origin>
 </class-path-extension>
 </data>
 </configuration>
</project>

22 changes: 22 additions & 0 deletions
platform/libs.jsvg/src/org/netbeans/libs/jsvg/Bundle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.


OpenIDE-Module-Name=JSVG Library
OpenIDE-Module-Short-Description=JSVG Library
OpenIDE-Module-Long-Description=Contains the JSVG library, for reading and painting SVG files.
OpenIDE-Module-Display-Category=Libraries

2 changes: 1 addition & 1 deletion
platform/openide.util.ui.svg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
 <code-name-base>org.openide.util.ui.svg</code-name-base>
 <module-dependencies>
 <dependency>
 <code-name-base>org.netbeans.libs.batik.read</code-name-base>
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <build-prerequisite/>
 <compile-dependency/>
 <run-dependency>
Expand Down

59 changes: 59 additions & 0 deletions
platform/openide.util.ui.svg/src/org/openide/util/svg/DenyingElementLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.openide.util.svg;

import com.github.weisj.jsvg.attributes.AttributeParser;
import com.github.weisj.jsvg.parser.ElementLoader;
import com.github.weisj.jsvg.parser.ParsedDocument;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

class DenyingElementLoader implements ElementLoader {
 private final Set<String> attemptedExternalURLsLoaded = new LinkedHashSet<>();

 public Set<String> getAttemptedExternalURLsLoaded() {
 return Collections.unmodifiableSet(attemptedExternalURLsLoaded);
 }

 @Override
 public <T> T loadElement(Class<T> type, String value,
 ParsedDocument document, AttributeParser attributeParser)
 {
 /* Same logic as in com.github.weisj.jsvg.parser.DefaultElementLoader for the
 AllowExternalResources.DENY case, but gathering up the attempted externally loaded URLs so
 we can make the whole loading operation fail and make testLoadImageWithExternalUseXlinkHref
 pass. */
 String url = attributeParser.parseUrl(value);
 if (url == null) {
 return null;
 }
 if (url.contains("#")) {
 String[] parts = url.split("#", 2);
 String name = parts[0];
 if (!name.isEmpty()) {
 attemptedExternalURLsLoaded.add(value);
 return null;
 }
 return document.getElementById(type, parts[1]);
 } else {
 return document.getElementById(type, url);
Comment thread
matthiasblaesing marked this conversation as resolved.

 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Switch SVG loading from the Batik library to JSVG#7941

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

 Merged

eirikbakke
merged 1 commit into

from

Nov 16, 2024
 Merged


Switch SVG loading from the Batik library to JSVG
#7941
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
nbbuild/cluster.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,7 @@ nb.cluster.platform=\
 libs.jna,\
 libs.jna.platform,\
 libs.jsr223,\
 libs.jsvg,\
 libs.junit4,\
 libs.junit5,\
 libs.osgi,\
Expand Down

21 changes: 21 additions & 0 deletions
nbbuild/licenses/MIT-jsvg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

1 change: 1 addition & 0 deletions
nbbuild/licenses/names.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,7 @@ MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MIT-vscode=MIT license for VSCode
MIT-vscode-ext=MIT license VS Code variant
MIT-jsvg=MIT license JSVG variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
W3C2=W3C Software and Document Notice and License
Expand Down

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/build.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->

<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="platform/libs.jsvg" default="build" basedir=".">
 <description>Builds the JSVG library wrapper module.</description>
 <import file="../../nbbuild/templates/projectized.xml"/>
</project>

18 changes: 18 additions & 0 deletions
platform/libs.jsvg/external/binaries-list

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

A84D34480044DB51A1448E9C0E32BD284B797288 com.github.weisj:jsvg:1.6.1

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/external/jsvg-1.6.1-license.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
Name: JSVG
Version: 1.6.1
Description: JSVG - A Java SVG implementation
License: MIT-jsvg
Origin: JSVG
URL: https://github.com/weisJ/jsvg
Files: jsvg-1.6.1.jar

MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5 changes: 5 additions & 0 deletions
platform/libs.jsvg/manifest.mf

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsvg
OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsvg/Bundle.properties
AutoUpdate-Show-In-Client: false

26 changes: 26 additions & 0 deletions
platform/libs.jsvg/nbproject/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

file.reference.jsvg-1.6.1.jar=external/jsvg-1.6.1.jar
release.external/jsvg-1.6.1.jar=modules/ext/jsvg-1.6.1.jar

is.autoload=true
javac.source=1.8

nbm.homepage=https://github.com/weisJ/jsvg
sigtest.gen.fail.on.error=false
spec.version.base=1.22.0

64 changes: 64 additions & 0 deletions
platform/libs.jsvg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
 <type>org.netbeans.modules.apisupport.project</type>
 <configuration>
 <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <module-dependencies/>
 <public-packages>
 <package>com.github.weisj.jsvg</package>
 <package>com.github.weisj.jsvg.attributes</package>
 <package>com.github.weisj.jsvg.attributes.filter</package>
 <package>com.github.weisj.jsvg.attributes.font</package>
 <package>com.github.weisj.jsvg.attributes.paint</package>
 <package>com.github.weisj.jsvg.attributes.stroke</package>
 <package>com.github.weisj.jsvg.attributes.text</package>
 <package>com.github.weisj.jsvg.geometry</package>
 <package>com.github.weisj.jsvg.geometry.mesh</package>
 <package>com.github.weisj.jsvg.geometry.noise</package>
 <package>com.github.weisj.jsvg.geometry.path</package>
 <package>com.github.weisj.jsvg.geometry.size</package>
 <package>com.github.weisj.jsvg.geometry.util</package>
 <package>com.github.weisj.jsvg.nodes</package>
 <package>com.github.weisj.jsvg.nodes.animation</package>
 <package>com.github.weisj.jsvg.nodes.container</package>
 <package>com.github.weisj.jsvg.nodes.filter</package>
 <package>com.github.weisj.jsvg.nodes.mesh</package>
 <package>com.github.weisj.jsvg.nodes.prototype</package>
 <package>com.github.weisj.jsvg.nodes.prototype.spec</package>
 <package>com.github.weisj.jsvg.nodes.text</package>
 <package>com.github.weisj.jsvg.parser</package>
 <package>com.github.weisj.jsvg.parser.css</package>
 <package>com.github.weisj.jsvg.parser.resources</package>
 <package>com.github.weisj.jsvg.renderer</package>
 <package>com.github.weisj.jsvg.renderer.awt</package>
 <package>com.github.weisj.jsvg.renderer.jdk</package>
 <package>com.github.weisj.jsvg.util</package>
 </public-packages>
 <class-path-extension>
 <runtime-relative-path>ext/jsvg-1.6.1.jar</runtime-relative-path>
 <binary-origin>external/jsvg-1.6.1.jar</binary-origin>
 </class-path-extension>
 </data>
 </configuration>
</project>

22 changes: 22 additions & 0 deletions
platform/libs.jsvg/src/org/netbeans/libs/jsvg/Bundle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.


OpenIDE-Module-Name=JSVG Library
OpenIDE-Module-Short-Description=JSVG Library
OpenIDE-Module-Long-Description=Contains the JSVG library, for reading and painting SVG files.
OpenIDE-Module-Display-Category=Libraries

2 changes: 1 addition & 1 deletion
platform/openide.util.ui.svg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
 <code-name-base>org.openide.util.ui.svg</code-name-base>
 <module-dependencies>
 <dependency>
 <code-name-base>org.netbeans.libs.batik.read</code-name-base>
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <build-prerequisite/>
 <compile-dependency/>
 <run-dependency>
Expand Down

59 changes: 59 additions & 0 deletions
platform/openide.util.ui.svg/src/org/openide/util/svg/DenyingElementLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.openide.util.svg;

import com.github.weisj.jsvg.attributes.AttributeParser;
import com.github.weisj.jsvg.parser.ElementLoader;
import com.github.weisj.jsvg.parser.ParsedDocument;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

class DenyingElementLoader implements ElementLoader {
 private final Set<String> attemptedExternalURLsLoaded = new LinkedHashSet<>();

 public Set<String> getAttemptedExternalURLsLoaded() {
 return Collections.unmodifiableSet(attemptedExternalURLsLoaded);
 }

 @Override
 public <T> T loadElement(Class<T> type, String value,
 ParsedDocument document, AttributeParser attributeParser)
 {
 /* Same logic as in com.github.weisj.jsvg.parser.DefaultElementLoader for the
 AllowExternalResources.DENY case, but gathering up the attempted externally loaded URLs so
 we can make the whole loading operation fail and make testLoadImageWithExternalUseXlinkHref
 pass. */
 String url = attributeParser.parseUrl(value);
 if (url == null) {
 return null;
 }
 if (url.contains("#")) {
 String[] parts = url.split("#", 2);
 String name = parts[0];
 if (!name.isEmpty()) {
 attemptedExternalURLsLoaded.add(value);
 return null;
 }
 return document.getElementById(type, parts[1]);
 } else {
 return document.getElementById(type, url);
Comment thread
matthiasblaesing marked this conversation as resolved.

 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Switch SVG loading from the Batik library to JSVG#7941

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

 Merged

eirikbakke
merged 1 commit into

from

Nov 16, 2024
 Merged


Switch SVG loading from the Batik library to JSVG
#7941
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
nbbuild/cluster.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,7 @@ nb.cluster.platform=\
 libs.jna,\
 libs.jna.platform,\
 libs.jsr223,\
 libs.jsvg,\
 libs.junit4,\
 libs.junit5,\
 libs.osgi,\
Expand Down

21 changes: 21 additions & 0 deletions
nbbuild/licenses/MIT-jsvg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

1 change: 1 addition & 0 deletions
nbbuild/licenses/names.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,7 @@ MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MIT-vscode=MIT license for VSCode
MIT-vscode-ext=MIT license VS Code variant
MIT-jsvg=MIT license JSVG variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
W3C2=W3C Software and Document Notice and License
Expand Down

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/build.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->

<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="platform/libs.jsvg" default="build" basedir=".">
 <description>Builds the JSVG library wrapper module.</description>
 <import file="../../nbbuild/templates/projectized.xml"/>
</project>

18 changes: 18 additions & 0 deletions
platform/libs.jsvg/external/binaries-list

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

A84D34480044DB51A1448E9C0E32BD284B797288 com.github.weisj:jsvg:1.6.1

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/external/jsvg-1.6.1-license.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
Name: JSVG
Version: 1.6.1
Description: JSVG - A Java SVG implementation
License: MIT-jsvg
Origin: JSVG
URL: https://github.com/weisJ/jsvg
Files: jsvg-1.6.1.jar

MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5 changes: 5 additions & 0 deletions
platform/libs.jsvg/manifest.mf

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsvg
OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsvg/Bundle.properties
AutoUpdate-Show-In-Client: false

26 changes: 26 additions & 0 deletions
platform/libs.jsvg/nbproject/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

file.reference.jsvg-1.6.1.jar=external/jsvg-1.6.1.jar
release.external/jsvg-1.6.1.jar=modules/ext/jsvg-1.6.1.jar

is.autoload=true
javac.source=1.8

nbm.homepage=https://github.com/weisJ/jsvg
sigtest.gen.fail.on.error=false
spec.version.base=1.22.0

64 changes: 64 additions & 0 deletions
platform/libs.jsvg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
 <type>org.netbeans.modules.apisupport.project</type>
 <configuration>
 <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <module-dependencies/>
 <public-packages>
 <package>com.github.weisj.jsvg</package>
 <package>com.github.weisj.jsvg.attributes</package>
 <package>com.github.weisj.jsvg.attributes.filter</package>
 <package>com.github.weisj.jsvg.attributes.font</package>
 <package>com.github.weisj.jsvg.attributes.paint</package>
 <package>com.github.weisj.jsvg.attributes.stroke</package>
 <package>com.github.weisj.jsvg.attributes.text</package>
 <package>com.github.weisj.jsvg.geometry</package>
 <package>com.github.weisj.jsvg.geometry.mesh</package>
 <package>com.github.weisj.jsvg.geometry.noise</package>
 <package>com.github.weisj.jsvg.geometry.path</package>
 <package>com.github.weisj.jsvg.geometry.size</package>
 <package>com.github.weisj.jsvg.geometry.util</package>
 <package>com.github.weisj.jsvg.nodes</package>
 <package>com.github.weisj.jsvg.nodes.animation</package>
 <package>com.github.weisj.jsvg.nodes.container</package>
 <package>com.github.weisj.jsvg.nodes.filter</package>
 <package>com.github.weisj.jsvg.nodes.mesh</package>
 <package>com.github.weisj.jsvg.nodes.prototype</package>
 <package>com.github.weisj.jsvg.nodes.prototype.spec</package>
 <package>com.github.weisj.jsvg.nodes.text</package>
 <package>com.github.weisj.jsvg.parser</package>
 <package>com.github.weisj.jsvg.parser.css</package>
 <package>com.github.weisj.jsvg.parser.resources</package>
 <package>com.github.weisj.jsvg.renderer</package>
 <package>com.github.weisj.jsvg.renderer.awt</package>
 <package>com.github.weisj.jsvg.renderer.jdk</package>
 <package>com.github.weisj.jsvg.util</package>
 </public-packages>
 <class-path-extension>
 <runtime-relative-path>ext/jsvg-1.6.1.jar</runtime-relative-path>
 <binary-origin>external/jsvg-1.6.1.jar</binary-origin>
 </class-path-extension>
 </data>
 </configuration>
</project>

22 changes: 22 additions & 0 deletions
platform/libs.jsvg/src/org/netbeans/libs/jsvg/Bundle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.


OpenIDE-Module-Name=JSVG Library
OpenIDE-Module-Short-Description=JSVG Library
OpenIDE-Module-Long-Description=Contains the JSVG library, for reading and painting SVG files.
OpenIDE-Module-Display-Category=Libraries

2 changes: 1 addition & 1 deletion
platform/openide.util.ui.svg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
 <code-name-base>org.openide.util.ui.svg</code-name-base>
 <module-dependencies>
 <dependency>
 <code-name-base>org.netbeans.libs.batik.read</code-name-base>
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <build-prerequisite/>
 <compile-dependency/>
 <run-dependency>
Expand Down

59 changes: 59 additions & 0 deletions
platform/openide.util.ui.svg/src/org/openide/util/svg/DenyingElementLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.openide.util.svg;

import com.github.weisj.jsvg.attributes.AttributeParser;
import com.github.weisj.jsvg.parser.ElementLoader;
import com.github.weisj.jsvg.parser.ParsedDocument;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

class DenyingElementLoader implements ElementLoader {
 private final Set<String> attemptedExternalURLsLoaded = new LinkedHashSet<>();

 public Set<String> getAttemptedExternalURLsLoaded() {
 return Collections.unmodifiableSet(attemptedExternalURLsLoaded);
 }

 @Override
 public <T> T loadElement(Class<T> type, String value,
 ParsedDocument document, AttributeParser attributeParser)
 {
 /* Same logic as in com.github.weisj.jsvg.parser.DefaultElementLoader for the
 AllowExternalResources.DENY case, but gathering up the attempted externally loaded URLs so
 we can make the whole loading operation fail and make testLoadImageWithExternalUseXlinkHref
 pass. */
 String url = attributeParser.parseUrl(value);
 if (url == null) {
 return null;
 }
 if (url.contains("#")) {
 String[] parts = url.split("#", 2);
 String name = parts[0];
 if (!name.isEmpty()) {
 attemptedExternalURLsLoaded.add(value);
 return null;
 }
 return document.getElementById(type, parts[1]);
 } else {
 return document.getElementById(type, url);
Comment thread
matthiasblaesing marked this conversation as resolved.

 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Switch SVG loading from the Batik library to JSVG#7941

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

 Merged

eirikbakke
merged 1 commit into

from

Nov 16, 2024
 Merged


Switch SVG loading from the Batik library to JSVG
#7941
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
nbbuild/cluster.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,7 @@ nb.cluster.platform=\
 libs.jna,\
 libs.jna.platform,\
 libs.jsr223,\
 libs.jsvg,\
 libs.junit4,\
 libs.junit5,\
 libs.osgi,\
Expand Down

21 changes: 21 additions & 0 deletions
nbbuild/licenses/MIT-jsvg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

1 change: 1 addition & 0 deletions
nbbuild/licenses/names.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,7 @@ MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MIT-vscode=MIT license for VSCode
MIT-vscode-ext=MIT license VS Code variant
MIT-jsvg=MIT license JSVG variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
W3C2=W3C Software and Document Notice and License
Expand Down

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/build.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->

<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="platform/libs.jsvg" default="build" basedir=".">
 <description>Builds the JSVG library wrapper module.</description>
 <import file="../../nbbuild/templates/projectized.xml"/>
</project>

18 changes: 18 additions & 0 deletions
platform/libs.jsvg/external/binaries-list

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

A84D34480044DB51A1448E9C0E32BD284B797288 com.github.weisj:jsvg:1.6.1

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/external/jsvg-1.6.1-license.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
Name: JSVG
Version: 1.6.1
Description: JSVG - A Java SVG implementation
License: MIT-jsvg
Origin: JSVG
URL: https://github.com/weisJ/jsvg
Files: jsvg-1.6.1.jar

MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5 changes: 5 additions & 0 deletions
platform/libs.jsvg/manifest.mf

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsvg
OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsvg/Bundle.properties
AutoUpdate-Show-In-Client: false

26 changes: 26 additions & 0 deletions
platform/libs.jsvg/nbproject/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

file.reference.jsvg-1.6.1.jar=external/jsvg-1.6.1.jar
release.external/jsvg-1.6.1.jar=modules/ext/jsvg-1.6.1.jar

is.autoload=true
javac.source=1.8

nbm.homepage=https://github.com/weisJ/jsvg
sigtest.gen.fail.on.error=false
spec.version.base=1.22.0

64 changes: 64 additions & 0 deletions
platform/libs.jsvg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
 <type>org.netbeans.modules.apisupport.project</type>
 <configuration>
 <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <module-dependencies/>
 <public-packages>
 <package>com.github.weisj.jsvg</package>
 <package>com.github.weisj.jsvg.attributes</package>
 <package>com.github.weisj.jsvg.attributes.filter</package>
 <package>com.github.weisj.jsvg.attributes.font</package>
 <package>com.github.weisj.jsvg.attributes.paint</package>
 <package>com.github.weisj.jsvg.attributes.stroke</package>
 <package>com.github.weisj.jsvg.attributes.text</package>
 <package>com.github.weisj.jsvg.geometry</package>
 <package>com.github.weisj.jsvg.geometry.mesh</package>
 <package>com.github.weisj.jsvg.geometry.noise</package>
 <package>com.github.weisj.jsvg.geometry.path</package>
 <package>com.github.weisj.jsvg.geometry.size</package>
 <package>com.github.weisj.jsvg.geometry.util</package>
 <package>com.github.weisj.jsvg.nodes</package>
 <package>com.github.weisj.jsvg.nodes.animation</package>
 <package>com.github.weisj.jsvg.nodes.container</package>
 <package>com.github.weisj.jsvg.nodes.filter</package>
 <package>com.github.weisj.jsvg.nodes.mesh</package>
 <package>com.github.weisj.jsvg.nodes.prototype</package>
 <package>com.github.weisj.jsvg.nodes.prototype.spec</package>
 <package>com.github.weisj.jsvg.nodes.text</package>
 <package>com.github.weisj.jsvg.parser</package>
 <package>com.github.weisj.jsvg.parser.css</package>
 <package>com.github.weisj.jsvg.parser.resources</package>
 <package>com.github.weisj.jsvg.renderer</package>
 <package>com.github.weisj.jsvg.renderer.awt</package>
 <package>com.github.weisj.jsvg.renderer.jdk</package>
 <package>com.github.weisj.jsvg.util</package>
 </public-packages>
 <class-path-extension>
 <runtime-relative-path>ext/jsvg-1.6.1.jar</runtime-relative-path>
 <binary-origin>external/jsvg-1.6.1.jar</binary-origin>
 </class-path-extension>
 </data>
 </configuration>
</project>

22 changes: 22 additions & 0 deletions
platform/libs.jsvg/src/org/netbeans/libs/jsvg/Bundle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.


OpenIDE-Module-Name=JSVG Library
OpenIDE-Module-Short-Description=JSVG Library
OpenIDE-Module-Long-Description=Contains the JSVG library, for reading and painting SVG files.
OpenIDE-Module-Display-Category=Libraries

2 changes: 1 addition & 1 deletion
platform/openide.util.ui.svg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
 <code-name-base>org.openide.util.ui.svg</code-name-base>
 <module-dependencies>
 <dependency>
 <code-name-base>org.netbeans.libs.batik.read</code-name-base>
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <build-prerequisite/>
 <compile-dependency/>
 <run-dependency>
Expand Down

59 changes: 59 additions & 0 deletions
platform/openide.util.ui.svg/src/org/openide/util/svg/DenyingElementLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.openide.util.svg;

import com.github.weisj.jsvg.attributes.AttributeParser;
import com.github.weisj.jsvg.parser.ElementLoader;
import com.github.weisj.jsvg.parser.ParsedDocument;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

class DenyingElementLoader implements ElementLoader {
 private final Set<String> attemptedExternalURLsLoaded = new LinkedHashSet<>();

 public Set<String> getAttemptedExternalURLsLoaded() {
 return Collections.unmodifiableSet(attemptedExternalURLsLoaded);
 }

 @Override
 public <T> T loadElement(Class<T> type, String value,
 ParsedDocument document, AttributeParser attributeParser)
 {
 /* Same logic as in com.github.weisj.jsvg.parser.DefaultElementLoader for the
 AllowExternalResources.DENY case, but gathering up the attempted externally loaded URLs so
 we can make the whole loading operation fail and make testLoadImageWithExternalUseXlinkHref
 pass. */
 String url = attributeParser.parseUrl(value);
 if (url == null) {
 return null;
 }
 if (url.contains("#")) {
 String[] parts = url.split("#", 2);
 String name = parts[0];
 if (!name.isEmpty()) {
 attemptedExternalURLsLoaded.add(value);
 return null;
 }
 return document.getElementById(type, parts[1]);
 } else {
 return document.getElementById(type, url);
Comment thread
matthiasblaesing marked this conversation as resolved.

 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Switch SVG loading from the Batik library to JSVG#7941

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

 Merged

eirikbakke
merged 1 commit into

from

Nov 16, 2024
 Merged


Switch SVG loading from the Batik library to JSVG
#7941
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
nbbuild/cluster.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,7 @@ nb.cluster.platform=\
 libs.jna,\
 libs.jna.platform,\
 libs.jsr223,\
 libs.jsvg,\
 libs.junit4,\
 libs.junit5,\
 libs.osgi,\
Expand Down

21 changes: 21 additions & 0 deletions
nbbuild/licenses/MIT-jsvg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

1 change: 1 addition & 0 deletions
nbbuild/licenses/names.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,7 @@ MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MIT-vscode=MIT license for VSCode
MIT-vscode-ext=MIT license VS Code variant
MIT-jsvg=MIT license JSVG variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
W3C2=W3C Software and Document Notice and License
Expand Down

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/build.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->

<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="platform/libs.jsvg" default="build" basedir=".">
 <description>Builds the JSVG library wrapper module.</description>
 <import file="../../nbbuild/templates/projectized.xml"/>
</project>

18 changes: 18 additions & 0 deletions
platform/libs.jsvg/external/binaries-list

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

A84D34480044DB51A1448E9C0E32BD284B797288 com.github.weisj:jsvg:1.6.1

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/external/jsvg-1.6.1-license.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
Name: JSVG
Version: 1.6.1
Description: JSVG - A Java SVG implementation
License: MIT-jsvg
Origin: JSVG
URL: https://github.com/weisJ/jsvg
Files: jsvg-1.6.1.jar

MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5 changes: 5 additions & 0 deletions
platform/libs.jsvg/manifest.mf

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsvg
OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsvg/Bundle.properties
AutoUpdate-Show-In-Client: false

26 changes: 26 additions & 0 deletions
platform/libs.jsvg/nbproject/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

file.reference.jsvg-1.6.1.jar=external/jsvg-1.6.1.jar
release.external/jsvg-1.6.1.jar=modules/ext/jsvg-1.6.1.jar

is.autoload=true
javac.source=1.8

nbm.homepage=https://github.com/weisJ/jsvg
sigtest.gen.fail.on.error=false
spec.version.base=1.22.0

64 changes: 64 additions & 0 deletions
platform/libs.jsvg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
 <type>org.netbeans.modules.apisupport.project</type>
 <configuration>
 <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <module-dependencies/>
 <public-packages>
 <package>com.github.weisj.jsvg</package>
 <package>com.github.weisj.jsvg.attributes</package>
 <package>com.github.weisj.jsvg.attributes.filter</package>
 <package>com.github.weisj.jsvg.attributes.font</package>
 <package>com.github.weisj.jsvg.attributes.paint</package>
 <package>com.github.weisj.jsvg.attributes.stroke</package>
 <package>com.github.weisj.jsvg.attributes.text</package>
 <package>com.github.weisj.jsvg.geometry</package>
 <package>com.github.weisj.jsvg.geometry.mesh</package>
 <package>com.github.weisj.jsvg.geometry.noise</package>
 <package>com.github.weisj.jsvg.geometry.path</package>
 <package>com.github.weisj.jsvg.geometry.size</package>
 <package>com.github.weisj.jsvg.geometry.util</package>
 <package>com.github.weisj.jsvg.nodes</package>
 <package>com.github.weisj.jsvg.nodes.animation</package>
 <package>com.github.weisj.jsvg.nodes.container</package>
 <package>com.github.weisj.jsvg.nodes.filter</package>
 <package>com.github.weisj.jsvg.nodes.mesh</package>
 <package>com.github.weisj.jsvg.nodes.prototype</package>
 <package>com.github.weisj.jsvg.nodes.prototype.spec</package>
 <package>com.github.weisj.jsvg.nodes.text</package>
 <package>com.github.weisj.jsvg.parser</package>
 <package>com.github.weisj.jsvg.parser.css</package>
 <package>com.github.weisj.jsvg.parser.resources</package>
 <package>com.github.weisj.jsvg.renderer</package>
 <package>com.github.weisj.jsvg.renderer.awt</package>
 <package>com.github.weisj.jsvg.renderer.jdk</package>
 <package>com.github.weisj.jsvg.util</package>
 </public-packages>
 <class-path-extension>
 <runtime-relative-path>ext/jsvg-1.6.1.jar</runtime-relative-path>
 <binary-origin>external/jsvg-1.6.1.jar</binary-origin>
 </class-path-extension>
 </data>
 </configuration>
</project>

22 changes: 22 additions & 0 deletions
platform/libs.jsvg/src/org/netbeans/libs/jsvg/Bundle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.


OpenIDE-Module-Name=JSVG Library
OpenIDE-Module-Short-Description=JSVG Library
OpenIDE-Module-Long-Description=Contains the JSVG library, for reading and painting SVG files.
OpenIDE-Module-Display-Category=Libraries

2 changes: 1 addition & 1 deletion
platform/openide.util.ui.svg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
 <code-name-base>org.openide.util.ui.svg</code-name-base>
 <module-dependencies>
 <dependency>
 <code-name-base>org.netbeans.libs.batik.read</code-name-base>
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <build-prerequisite/>
 <compile-dependency/>
 <run-dependency>
Expand Down

59 changes: 59 additions & 0 deletions
platform/openide.util.ui.svg/src/org/openide/util/svg/DenyingElementLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.openide.util.svg;

import com.github.weisj.jsvg.attributes.AttributeParser;
import com.github.weisj.jsvg.parser.ElementLoader;
import com.github.weisj.jsvg.parser.ParsedDocument;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

class DenyingElementLoader implements ElementLoader {
 private final Set<String> attemptedExternalURLsLoaded = new LinkedHashSet<>();

 public Set<String> getAttemptedExternalURLsLoaded() {
 return Collections.unmodifiableSet(attemptedExternalURLsLoaded);
 }

 @Override
 public <T> T loadElement(Class<T> type, String value,
 ParsedDocument document, AttributeParser attributeParser)
 {
 /* Same logic as in com.github.weisj.jsvg.parser.DefaultElementLoader for the
 AllowExternalResources.DENY case, but gathering up the attempted externally loaded URLs so
 we can make the whole loading operation fail and make testLoadImageWithExternalUseXlinkHref
 pass. */
 String url = attributeParser.parseUrl(value);
 if (url == null) {
 return null;
 }
 if (url.contains("#")) {
 String[] parts = url.split("#", 2);
 String name = parts[0];
 if (!name.isEmpty()) {
 attemptedExternalURLsLoaded.add(value);
 return null;
 }
 return document.getElementById(type, parts[1]);
 } else {
 return document.getElementById(type, url);
Comment thread
matthiasblaesing marked this conversation as resolved.

 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Switch SVG loading from the Batik library to JSVG#7941

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

 Merged

eirikbakke
merged 1 commit into

from

Nov 16, 2024
 Merged


Switch SVG loading from the Batik library to JSVG
#7941
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
nbbuild/cluster.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,7 @@ nb.cluster.platform=\
 libs.jna,\
 libs.jna.platform,\
 libs.jsr223,\
 libs.jsvg,\
 libs.junit4,\
 libs.junit5,\
 libs.osgi,\
Expand Down

21 changes: 21 additions & 0 deletions
nbbuild/licenses/MIT-jsvg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

1 change: 1 addition & 0 deletions
nbbuild/licenses/names.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,7 @@ MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MIT-vscode=MIT license for VSCode
MIT-vscode-ext=MIT license VS Code variant
MIT-jsvg=MIT license JSVG variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
W3C2=W3C Software and Document Notice and License
Expand Down

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/build.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->

<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="platform/libs.jsvg" default="build" basedir=".">
 <description>Builds the JSVG library wrapper module.</description>
 <import file="../../nbbuild/templates/projectized.xml"/>
</project>

18 changes: 18 additions & 0 deletions
platform/libs.jsvg/external/binaries-list

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

A84D34480044DB51A1448E9C0E32BD284B797288 com.github.weisj:jsvg:1.6.1

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/external/jsvg-1.6.1-license.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
Name: JSVG
Version: 1.6.1
Description: JSVG - A Java SVG implementation
License: MIT-jsvg
Origin: JSVG
URL: https://github.com/weisJ/jsvg
Files: jsvg-1.6.1.jar

MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5 changes: 5 additions & 0 deletions
platform/libs.jsvg/manifest.mf

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsvg
OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsvg/Bundle.properties
AutoUpdate-Show-In-Client: false

26 changes: 26 additions & 0 deletions
platform/libs.jsvg/nbproject/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

file.reference.jsvg-1.6.1.jar=external/jsvg-1.6.1.jar
release.external/jsvg-1.6.1.jar=modules/ext/jsvg-1.6.1.jar

is.autoload=true
javac.source=1.8

nbm.homepage=https://github.com/weisJ/jsvg
sigtest.gen.fail.on.error=false
spec.version.base=1.22.0

64 changes: 64 additions & 0 deletions
platform/libs.jsvg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
 <type>org.netbeans.modules.apisupport.project</type>
 <configuration>
 <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <module-dependencies/>
 <public-packages>
 <package>com.github.weisj.jsvg</package>
 <package>com.github.weisj.jsvg.attributes</package>
 <package>com.github.weisj.jsvg.attributes.filter</package>
 <package>com.github.weisj.jsvg.attributes.font</package>
 <package>com.github.weisj.jsvg.attributes.paint</package>
 <package>com.github.weisj.jsvg.attributes.stroke</package>
 <package>com.github.weisj.jsvg.attributes.text</package>
 <package>com.github.weisj.jsvg.geometry</package>
 <package>com.github.weisj.jsvg.geometry.mesh</package>
 <package>com.github.weisj.jsvg.geometry.noise</package>
 <package>com.github.weisj.jsvg.geometry.path</package>
 <package>com.github.weisj.jsvg.geometry.size</package>
 <package>com.github.weisj.jsvg.geometry.util</package>
 <package>com.github.weisj.jsvg.nodes</package>
 <package>com.github.weisj.jsvg.nodes.animation</package>
 <package>com.github.weisj.jsvg.nodes.container</package>
 <package>com.github.weisj.jsvg.nodes.filter</package>
 <package>com.github.weisj.jsvg.nodes.mesh</package>
 <package>com.github.weisj.jsvg.nodes.prototype</package>
 <package>com.github.weisj.jsvg.nodes.prototype.spec</package>
 <package>com.github.weisj.jsvg.nodes.text</package>
 <package>com.github.weisj.jsvg.parser</package>
 <package>com.github.weisj.jsvg.parser.css</package>
 <package>com.github.weisj.jsvg.parser.resources</package>
 <package>com.github.weisj.jsvg.renderer</package>
 <package>com.github.weisj.jsvg.renderer.awt</package>
 <package>com.github.weisj.jsvg.renderer.jdk</package>
 <package>com.github.weisj.jsvg.util</package>
 </public-packages>
 <class-path-extension>
 <runtime-relative-path>ext/jsvg-1.6.1.jar</runtime-relative-path>
 <binary-origin>external/jsvg-1.6.1.jar</binary-origin>
 </class-path-extension>
 </data>
 </configuration>
</project>

22 changes: 22 additions & 0 deletions
platform/libs.jsvg/src/org/netbeans/libs/jsvg/Bundle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.


OpenIDE-Module-Name=JSVG Library
OpenIDE-Module-Short-Description=JSVG Library
OpenIDE-Module-Long-Description=Contains the JSVG library, for reading and painting SVG files.
OpenIDE-Module-Display-Category=Libraries

2 changes: 1 addition & 1 deletion
platform/openide.util.ui.svg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
 <code-name-base>org.openide.util.ui.svg</code-name-base>
 <module-dependencies>
 <dependency>
 <code-name-base>org.netbeans.libs.batik.read</code-name-base>
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <build-prerequisite/>
 <compile-dependency/>
 <run-dependency>
Expand Down

59 changes: 59 additions & 0 deletions
platform/openide.util.ui.svg/src/org/openide/util/svg/DenyingElementLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.openide.util.svg;

import com.github.weisj.jsvg.attributes.AttributeParser;
import com.github.weisj.jsvg.parser.ElementLoader;
import com.github.weisj.jsvg.parser.ParsedDocument;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

class DenyingElementLoader implements ElementLoader {
 private final Set<String> attemptedExternalURLsLoaded = new LinkedHashSet<>();

 public Set<String> getAttemptedExternalURLsLoaded() {
 return Collections.unmodifiableSet(attemptedExternalURLsLoaded);
 }

 @Override
 public <T> T loadElement(Class<T> type, String value,
 ParsedDocument document, AttributeParser attributeParser)
 {
 /* Same logic as in com.github.weisj.jsvg.parser.DefaultElementLoader for the
 AllowExternalResources.DENY case, but gathering up the attempted externally loaded URLs so
 we can make the whole loading operation fail and make testLoadImageWithExternalUseXlinkHref
 pass. */
 String url = attributeParser.parseUrl(value);
 if (url == null) {
 return null;
 }
 if (url.contains("#")) {
 String[] parts = url.split("#", 2);
 String name = parts[0];
 if (!name.isEmpty()) {
 attemptedExternalURLsLoaded.add(value);
 return null;
 }
 return document.getElementById(type, parts[1]);
 } else {
 return document.getElementById(type, url);
Comment thread
matthiasblaesing marked this conversation as resolved.

 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Switch SVG loading from the Batik library to JSVG#7941

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

 Merged

eirikbakke
merged 1 commit into

from

Nov 16, 2024
 Merged


Switch SVG loading from the Batik library to JSVG
#7941
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
nbbuild/cluster.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,7 @@ nb.cluster.platform=\
 libs.jna,\
 libs.jna.platform,\
 libs.jsr223,\
 libs.jsvg,\
 libs.junit4,\
 libs.junit5,\
 libs.osgi,\
Expand Down

21 changes: 21 additions & 0 deletions
nbbuild/licenses/MIT-jsvg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

1 change: 1 addition & 0 deletions
nbbuild/licenses/names.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,7 @@ MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MIT-vscode=MIT license for VSCode
MIT-vscode-ext=MIT license VS Code variant
MIT-jsvg=MIT license JSVG variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
W3C2=W3C Software and Document Notice and License
Expand Down

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/build.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->

<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="platform/libs.jsvg" default="build" basedir=".">
 <description>Builds the JSVG library wrapper module.</description>
 <import file="../../nbbuild/templates/projectized.xml"/>
</project>

18 changes: 18 additions & 0 deletions
platform/libs.jsvg/external/binaries-list

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

A84D34480044DB51A1448E9C0E32BD284B797288 com.github.weisj:jsvg:1.6.1

29 changes: 29 additions & 0 deletions
platform/libs.jsvg/external/jsvg-1.6.1-license.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
Name: JSVG
Version: 1.6.1
Description: JSVG - A Java SVG implementation
License: MIT-jsvg
Origin: JSVG
URL: https://github.com/weisJ/jsvg
Files: jsvg-1.6.1.jar

MIT License

Copyright (c) 2021-2024 Jannis Weis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5 changes: 5 additions & 0 deletions
platform/libs.jsvg/manifest.mf

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsvg
OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsvg/Bundle.properties
AutoUpdate-Show-In-Client: false

26 changes: 26 additions & 0 deletions
platform/libs.jsvg/nbproject/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

file.reference.jsvg-1.6.1.jar=external/jsvg-1.6.1.jar
release.external/jsvg-1.6.1.jar=modules/ext/jsvg-1.6.1.jar

is.autoload=true
javac.source=1.8

nbm.homepage=https://github.com/weisJ/jsvg
sigtest.gen.fail.on.error=false
spec.version.base=1.22.0

64 changes: 64 additions & 0 deletions
platform/libs.jsvg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership. The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
 <type>org.netbeans.modules.apisupport.project</type>
 <configuration>
 <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <module-dependencies/>
 <public-packages>
 <package>com.github.weisj.jsvg</package>
 <package>com.github.weisj.jsvg.attributes</package>
 <package>com.github.weisj.jsvg.attributes.filter</package>
 <package>com.github.weisj.jsvg.attributes.font</package>
 <package>com.github.weisj.jsvg.attributes.paint</package>
 <package>com.github.weisj.jsvg.attributes.stroke</package>
 <package>com.github.weisj.jsvg.attributes.text</package>
 <package>com.github.weisj.jsvg.geometry</package>
 <package>com.github.weisj.jsvg.geometry.mesh</package>
 <package>com.github.weisj.jsvg.geometry.noise</package>
 <package>com.github.weisj.jsvg.geometry.path</package>
 <package>com.github.weisj.jsvg.geometry.size</package>
 <package>com.github.weisj.jsvg.geometry.util</package>
 <package>com.github.weisj.jsvg.nodes</package>
 <package>com.github.weisj.jsvg.nodes.animation</package>
 <package>com.github.weisj.jsvg.nodes.container</package>
 <package>com.github.weisj.jsvg.nodes.filter</package>
 <package>com.github.weisj.jsvg.nodes.mesh</package>
 <package>com.github.weisj.jsvg.nodes.prototype</package>
 <package>com.github.weisj.jsvg.nodes.prototype.spec</package>
 <package>com.github.weisj.jsvg.nodes.text</package>
 <package>com.github.weisj.jsvg.parser</package>
 <package>com.github.weisj.jsvg.parser.css</package>
 <package>com.github.weisj.jsvg.parser.resources</package>
 <package>com.github.weisj.jsvg.renderer</package>
 <package>com.github.weisj.jsvg.renderer.awt</package>
 <package>com.github.weisj.jsvg.renderer.jdk</package>
 <package>com.github.weisj.jsvg.util</package>
 </public-packages>
 <class-path-extension>
 <runtime-relative-path>ext/jsvg-1.6.1.jar</runtime-relative-path>
 <binary-origin>external/jsvg-1.6.1.jar</binary-origin>
 </class-path-extension>
 </data>
 </configuration>
</project>

22 changes: 22 additions & 0 deletions
platform/libs.jsvg/src/org/netbeans/libs/jsvg/Bundle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.


OpenIDE-Module-Name=JSVG Library
OpenIDE-Module-Short-Description=JSVG Library
OpenIDE-Module-Long-Description=Contains the JSVG library, for reading and painting SVG files.
OpenIDE-Module-Display-Category=Libraries

2 changes: 1 addition & 1 deletion
platform/openide.util.ui.svg/nbproject/project.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
 <code-name-base>org.openide.util.ui.svg</code-name-base>
 <module-dependencies>
 <dependency>
 <code-name-base>org.netbeans.libs.batik.read</code-name-base>
 <code-name-base>org.netbeans.libs.jsvg</code-name-base>
 <build-prerequisite/>
 <compile-dependency/>
 <run-dependency>
Expand Down

59 changes: 59 additions & 0 deletions
platform/openide.util.ui.svg/src/org/openide/util/svg/DenyingElementLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.openide.util.svg;

import com.github.weisj.jsvg.attributes.AttributeParser;
import com.github.weisj.jsvg.parser.ElementLoader;
import com.github.weisj.jsvg.parser.ParsedDocument;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

class DenyingElementLoader implements ElementLoader {
 private final Set<String> attemptedExternalURLsLoaded = new LinkedHashSet<>();

 public Set<String> getAttemptedExternalURLsLoaded() {
 return Collections.unmodifiableSet(attemptedExternalURLsLoaded);
 }

 @Override
 public <T> T loadElement(Class<T> type, String value,
 ParsedDocument document, AttributeParser attributeParser)
 {
 /* Same logic as in com.github.weisj.jsvg.parser.DefaultElementLoader for the
 AllowExternalResources.DENY case, but gathering up the attempted externally loaded URLs so
 we can make the whole loading operation fail and make testLoadImageWithExternalUseXlinkHref
 pass. */
 String url = attributeParser.parseUrl(value);
 if (url == null) {
 return null;
 }
 if (url.contains("#")) {
 String[] parts = url.split("#", 2);
 String name = parts[0];
 if (!name.isEmpty()) {
 attemptedExternalURLsLoaded.add(value);
 return null;
 }
 return document.getElementById(type, parts[1]);
 } else {
 return document.getElementById(type, url);
Comment thread
matthiasblaesing marked this conversation as resolved.

 }
 }
}
Loading