From 4ac7bb22d19ae732f11f3a584fdac862bd425742 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 17 Oct 2007 17:06:52 +0000
Subject: [PATCH] minor: fix typos
SVN: 2192
---
.../systemsx/cisd/bds/DataStructureV1_0.java | 4 +--
.../cisd/bds/FormatedDataFactory.java | 26 +++++++++----------
...IFormatedData.java => IFormattedData.java} | 2 +-
...FormatedData.java => NoFormattedData.java} | 6 ++---
.../cisd/bds/DataStructureV1_0Test.java | 4 +--
5 files changed, 21 insertions(+), 21 deletions(-)
rename bds/source/java/ch/systemsx/cisd/bds/{IFormatedData.java => IFormattedData.java} (96%)
rename bds/source/java/ch/systemsx/cisd/bds/{NoFormatedData.java => NoFormattedData.java} (84%)
diff --git a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
index e260248a5db..9648e9dc49e 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
@@ -68,7 +68,7 @@ public class DataStructureV1_0 extends AbstractDataStructure
*
* @throws UserFailureException if this method has been invoked before the format has been set.
*/
- public IFormatedData getFormatedData()
+ public IFormattedData getFormatedData()
{
if (format == null)
{
@@ -141,7 +141,7 @@ public class DataStructureV1_0 extends AbstractDataStructure
{
if (getOriginalData().iterator().hasNext() == false)
{
- throw new UserFailureException("Empty orginal data directory.");
+ throw new UserFailureException("Empty original data directory.");
}
IDirectory metaDataDirectory = getMetaDataDirectory();
if (metaDataDirectory.tryToGetNode(Format.FORMAT_DIR) == null)
diff --git a/bds/source/java/ch/systemsx/cisd/bds/FormatedDataFactory.java b/bds/source/java/ch/systemsx/cisd/bds/FormatedDataFactory.java
index 707438aa69a..ef32a8a41dd 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/FormatedDataFactory.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/FormatedDataFactory.java
@@ -24,58 +24,58 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
/**
- * Factory for objects of type {@link IFormatedData}.
+ * Factory for objects of type {@link IFormattedData}.
*
* @author Franz-Josef Elmer
*/
class FormatedDataFactory
{
- private static final Map<String, Factory<IFormatedData>> factories = new HashMap<String, Factory<IFormatedData>>();
+ private static final Map<String, Factory<IFormattedData>> factories = new HashMap<String, Factory<IFormattedData>>();
static
{
- register(UnknownFormat1_0.UNKNOWN_1_0, NoFormatedData.class);
+ register(UnknownFormat1_0.UNKNOWN_1_0, NoFormattedData.class);
}
- static void register(Format format, Class<? extends IFormatedData> clazz)
+ static void register(Format format, Class<? extends IFormattedData> clazz)
{
String code = format.getCode();
- Factory<IFormatedData> factory = factories.get(code);
+ Factory<IFormattedData> factory = factories.get(code);
if (factory == null)
{
- factory = new Factory<IFormatedData>();
+ factory = new Factory<IFormattedData>();
factories.put(code, factory);
}
factory.register(format.getVersion(), clazz);
}
- static Class<? extends IFormatedData> getFormatedDataInterfaceFor(Format format, Format defaultFormat)
+ static Class<? extends IFormattedData> getFormatedDataInterfaceFor(Format format, Format defaultFormat)
{
- Factory<IFormatedData> factory = getFactory(format, defaultFormat);
+ Factory<IFormattedData> factory = getFactory(format, defaultFormat);
return factory.getClassFor(format.getVersion());
}
- static IFormatedData createFormatedData(IDirectory dataDirectory, Format format, Format defaultFormat)
+ static IFormattedData createFormatedData(IDirectory dataDirectory, Format format, Format defaultFormat)
{
- Factory<IFormatedData> factory = getFactory(format, defaultFormat);
+ Factory<IFormattedData> factory = getFactory(format, defaultFormat);
return factory.create(IDirectory.class, dataDirectory, format.getVersion());
}
- private static Factory<IFormatedData> getFactory(Format format, Format defaultFormat)
+ private static Factory<IFormattedData> getFactory(Format format, Format defaultFormat)
{
assert format != null : "Unspecified format.";
String code = format.getCode();
assert code != null : "Unspecified format code.";
assert format.getVersion() != null : "Unspecified version.";
- Factory<IFormatedData> factory = factories.get(code);
+ Factory<IFormattedData> factory = factories.get(code);
if (factory == null)
{
if (defaultFormat != null)
{
return getFactory(defaultFormat, null);
}
- throw new UserFailureException("Unkown format code: " + code);
+ throw new UserFailureException("Unknown format code: " + code);
}
return factory;
}
diff --git a/bds/source/java/ch/systemsx/cisd/bds/IFormatedData.java b/bds/source/java/ch/systemsx/cisd/bds/IFormattedData.java
similarity index 96%
rename from bds/source/java/ch/systemsx/cisd/bds/IFormatedData.java
rename to bds/source/java/ch/systemsx/cisd/bds/IFormattedData.java
index a029aeb6336..fac44701476 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/IFormatedData.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/IFormattedData.java
@@ -21,7 +21,7 @@ package ch.systemsx.cisd.bds;
*
* @author Franz-Josef Elmer
*/
-public interface IFormatedData
+public interface IFormattedData
{
/**
* Returns the format of data.
diff --git a/bds/source/java/ch/systemsx/cisd/bds/NoFormatedData.java b/bds/source/java/ch/systemsx/cisd/bds/NoFormattedData.java
similarity index 84%
rename from bds/source/java/ch/systemsx/cisd/bds/NoFormatedData.java
rename to bds/source/java/ch/systemsx/cisd/bds/NoFormattedData.java
index e5bf25a010f..d6aca4ea084 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/NoFormatedData.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/NoFormattedData.java
@@ -19,12 +19,12 @@ package ch.systemsx.cisd.bds;
import ch.systemsx.cisd.bds.storage.IDirectory;
/**
- * Most simplest implementation of {@link IFormatedData}. It is associated with {@link UnknownFormat1_0}.
+ * Most simplest implementation of {@link IFormattedData}. It is associated with {@link UnknownFormat1_0}.
* It can be subclassed provided {@link #getFormat()} will be overridden.
*
* @author Franz-Josef Elmer
*/
-public class NoFormatedData implements IFormatedData
+public class NoFormattedData implements IFormattedData
{
/**
* Root directory of formated data.
@@ -34,7 +34,7 @@ public class NoFormatedData implements IFormatedData
/**
* Creates an instance for the specified data directory.
*/
- public NoFormatedData(IDirectory dataDirectory)
+ public NoFormattedData(IDirectory dataDirectory)
{
this.dataDirectory = dataDirectory;
}
diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
index 65987647074..0b8f94bf2b7 100644
--- a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
+++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
@@ -70,8 +70,8 @@ public class DataStructureV1_0Test
public void testGetFormatedData()
{
dataStructure.setFormat(UnknownFormat1_0.UNKNOWN_1_0);
- IFormatedData formatedData = dataStructure.getFormatedData();
- assertTrue(formatedData instanceof NoFormatedData);
+ IFormattedData formatedData = dataStructure.getFormatedData();
+ assertTrue(formatedData instanceof NoFormattedData);
assertEquals(UnknownFormat1_0.UNKNOWN_1_0, formatedData.getFormat());
}
--
GitLab