diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf')
3 files changed, 2 insertions, 47 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/PackageNotFoundException.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/PackageNotFoundException.java deleted file mode 100644 index 44e673439d..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/PackageNotFoundException.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2004-2014 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.util; - -import org.eclipse.emf.cdo.common.util.CDOException; - -import org.eclipse.emf.internal.cdo.messages.Messages; - -import org.eclipse.emf.ecore.EPackage.Registry; - -import java.text.MessageFormat; - -/** - * A {@link CDOException} to indicate that an EPackage is not available in the current {@link Registry} - * - * @author Esteban Dugueperoux - * @since 4.4 - */ -public class PackageNotFoundException extends CDOException -{ - private static final long serialVersionUID = 1L; - - private String uri; - - public PackageNotFoundException(String uri) - { - super(MessageFormat.format(Messages.getString("CDOSessionImpl.0"), uri)); - this.uri = uri; - } - - public String uri() - { - return uri; - } - -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties index 82bcf62fe5..3c0de29776 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties @@ -22,7 +22,6 @@ CDOResourceNodeImpl.5=Duplicate path: {0} CDOSessionConfigurationImpl.0=Session is already open CDOSessionConfigurationImpl.1=Session is not open CDOSessionFactory.1=Query is empty: {0} -CDOSessionImpl.0=Generated packages locally not available: {0} CDOSessionImpl.1=Commit notification arrived while view is inactive CDOSessionImpl.2=Commit notification arrived while session is inactive CDOStaleReferencePolicy.0=EXCEPTION diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java index 7a360af0cd..69beef82a3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java @@ -52,6 +52,7 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta; import org.eclipse.emf.cdo.common.security.CDOPermission; import org.eclipse.emf.cdo.common.util.CDOCommonUtil; +import org.eclipse.emf.cdo.common.util.CDOPackageNotFoundException; import org.eclipse.emf.cdo.common.util.RepositoryStateChangedEvent; import org.eclipse.emf.cdo.common.util.RepositoryTypeChangedEvent; import org.eclipse.emf.cdo.eresource.EresourcePackage; @@ -82,7 +83,6 @@ import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager; import org.eclipse.emf.cdo.spi.common.revision.PointerCDORevision; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.cdo.util.PackageNotFoundException; import org.eclipse.emf.cdo.view.CDOFetchRuleManager; import org.eclipse.emf.cdo.view.CDOView; @@ -578,7 +578,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl impleme { if (!options().isGeneratedPackageEmulationEnabled()) { - throw new PackageNotFoundException(packageUnit.getID()); + throw new CDOPackageNotFoundException(packageUnit.getID()); } } |