Skip to content

EMFUtil.AbsoluteURIPreservingURIHandler should not be a singleton #157 #158

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
claesrosell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EMFUtil.AbsoluteURIPreservingURIHandler should not be a singleton #157 #158

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
4 changes: 1 addition & 3 deletions plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ public boolean apply(EStructuralFeature feature)

private static final EPackage.Registry[] GLOBAL_REGISTRY_ARRAY = { EPackage.Registry.INSTANCE };

private static final XMLResource.URIHandler ABSOLUTE_URI_PRESERVING_URI_HANDLER = new AbsoluteURIPreservingURIHandler();

private static final boolean CONVERT_TO_RELATIVE_URIS = OMPlatform.INSTANCE.isProperty("org.eclipse.emf.cdo.common.model.EMFUtil.CONVERT_TO_RELATIVE_URIS");

private EMFUtil()
Expand Down Expand Up @@ -742,7 +740,7 @@ private static Map<String, Object> createResourceOptions(boolean zipped)

if (!CONVERT_TO_RELATIVE_URIS)
{
options.put(XMLResource.OPTION_URI_HANDLER, ABSOLUTE_URI_PRESERVING_URI_HANDLER);
options.put(XMLResource.OPTION_URI_HANDLER, new AbsoluteURIPreservingURIHandler());
}

if (zipped)
Expand Down