From c4b544e50b0f4e0a8a883ca7bec329f02b044e64 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 31 Oct 2011 23:15:59 -0400 Subject: [PATCH] Rename packages to org.openslide --- LICENSE.txt | 2 +- Makefile.am | 24 +++++++++++----------- build.xml | 2 +- openslide-jni.c | 2 +- .../cs => org}/openslide/AssociatedImageMap.java | 2 +- src/{edu/cmu/cs => org}/openslide/OpenSlide.java | 2 +- .../openslide/OpenSlideDisposedException.java | 2 +- .../cmu/cs => org}/openslide/OpenSlideJNI.java | 2 +- src/{edu/cmu/cs => org}/openslide/TestCLI.java | 2 +- src/org/openslide/dzi/DeepZoomGenerator.java | 2 +- .../cmu/cs => org}/openslide/gui/Annotation.java | 2 +- .../openslide/gui/DefaultAnnotation.java | 2 +- .../openslide/gui/DefaultSelectionListModel.java | 2 +- src/{edu/cmu/cs => org}/openslide/gui/Demo.java | 4 ++-- .../cs => org}/openslide/gui/OpenSlideView.java | 4 ++-- .../openslide/gui/SelectionListModel.java | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) rename src/{edu/cmu/cs => org}/openslide/AssociatedImageMap.java (99%) rename src/{edu/cmu/cs => org}/openslide/OpenSlide.java (99%) rename src/{edu/cmu/cs => org}/openslide/OpenSlideDisposedException.java (97%) rename src/{edu/cmu/cs => org}/openslide/OpenSlideJNI.java (98%) rename src/{edu/cmu/cs => org}/openslide/TestCLI.java (98%) rename src/{edu/cmu/cs => org}/openslide/gui/Annotation.java (96%) rename src/{edu/cmu/cs => org}/openslide/gui/DefaultAnnotation.java (97%) rename src/{edu/cmu/cs => org}/openslide/gui/DefaultSelectionListModel.java (98%) rename src/{edu/cmu/cs => org}/openslide/gui/Demo.java (99%) rename src/{edu/cmu/cs => org}/openslide/gui/OpenSlideView.java (99%) rename src/{edu/cmu/cs => org}/openslide/gui/SelectionListModel.java (97%) diff --git a/LICENSE.txt b/LICENSE.txt index 3d101ac..3b1c01a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ OpenSlide -Carnegie Mellon University +Carnegie Mellon University and others http://openslide.org/ diff --git a/Makefile.am b/Makefile.am index 03db8ee..f90e658 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,18 +26,18 @@ libopenslide_jni_la_SOURCES = openslide-jni.c pkglib_DATA = openslide.jar JAVA_SRC = build.xml \ - src/edu/cmu/cs/openslide/AssociatedImageMap.java \ - src/edu/cmu/cs/openslide/OpenSlideDisposedException.java \ - src/edu/cmu/cs/openslide/OpenSlide.java \ - src/edu/cmu/cs/openslide/OpenSlideJNI.java \ - src/edu/cmu/cs/openslide/TestCLI.java \ - src/edu/cmu/cs/openslide/gui/Annotation.java \ - src/edu/cmu/cs/openslide/gui/DefaultAnnotation.java \ - src/edu/cmu/cs/openslide/gui/DefaultSelectionListModel.java \ - src/edu/cmu/cs/openslide/gui/Demo.java \ - src/edu/cmu/cs/openslide/gui/OpenSlideView.java \ - src/edu/cmu/cs/openslide/gui/SelectionListModel.java \ - src/org/openslide/dzi/DeepZoomGenerator.java + src/org/openslide/AssociatedImageMap.java \ + src/org/openslide/OpenSlideDisposedException.java \ + src/org/openslide/OpenSlide.java \ + src/org/openslide/OpenSlideJNI.java \ + src/org/openslide/TestCLI.java \ + src/org/openslide/dzi/DeepZoomGenerator.java \ + src/org/openslide/gui/Annotation.java \ + src/org/openslide/gui/DefaultAnnotation.java \ + src/org/openslide/gui/DefaultSelectionListModel.java \ + src/org/openslide/gui/Demo.java \ + src/org/openslide/gui/OpenSlideView.java \ + src/org/openslide/gui/SelectionListModel.java openslide.jar: $(JAVA_SRC) config.h @$(ANT) -f $(srcdir)/build.xml -Dbuilddir=$(abs_builddir) \ diff --git a/build.xml b/build.xml index 54341e3..dba2d7f 100644 --- a/build.xml +++ b/build.xml @@ -23,7 +23,7 @@ - + diff --git a/openslide-jni.c b/openslide-jni.c index 9d6726c..9acad42 100644 --- a/openslide-jni.c +++ b/openslide-jni.c @@ -205,7 +205,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { return -1; } - jclass clazz = (*env)->FindClass(env, "edu/cmu/cs/openslide/OpenSlideJNI"); + jclass clazz = (*env)->FindClass(env, "org/openslide/OpenSlideJNI"); if (clazz == NULL) { return -1; } diff --git a/src/edu/cmu/cs/openslide/AssociatedImageMap.java b/src/org/openslide/AssociatedImageMap.java similarity index 99% rename from src/edu/cmu/cs/openslide/AssociatedImageMap.java rename to src/org/openslide/AssociatedImageMap.java index 13fc9b9..cc3221d 100644 --- a/src/edu/cmu/cs/openslide/AssociatedImageMap.java +++ b/src/org/openslide/AssociatedImageMap.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide; +package org.openslide; import java.awt.image.BufferedImage; import java.awt.image.DataBufferInt; diff --git a/src/edu/cmu/cs/openslide/OpenSlide.java b/src/org/openslide/OpenSlide.java similarity index 99% rename from src/edu/cmu/cs/openslide/OpenSlide.java rename to src/org/openslide/OpenSlide.java index dc7bd76..fac908b 100644 --- a/src/edu/cmu/cs/openslide/OpenSlide.java +++ b/src/org/openslide/OpenSlide.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide; +package org.openslide; import java.awt.Color; import java.awt.Graphics2D; diff --git a/src/edu/cmu/cs/openslide/OpenSlideDisposedException.java b/src/org/openslide/OpenSlideDisposedException.java similarity index 97% rename from src/edu/cmu/cs/openslide/OpenSlideDisposedException.java rename to src/org/openslide/OpenSlideDisposedException.java index d83fad9..beabf9f 100644 --- a/src/edu/cmu/cs/openslide/OpenSlideDisposedException.java +++ b/src/org/openslide/OpenSlideDisposedException.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide; +package org.openslide; public class OpenSlideDisposedException extends RuntimeException { private static final String MSG = "OpenSlide object has been disposed"; diff --git a/src/edu/cmu/cs/openslide/OpenSlideJNI.java b/src/org/openslide/OpenSlideJNI.java similarity index 98% rename from src/edu/cmu/cs/openslide/OpenSlideJNI.java rename to src/org/openslide/OpenSlideJNI.java index aea7d4a..0758462 100644 --- a/src/edu/cmu/cs/openslide/OpenSlideJNI.java +++ b/src/org/openslide/OpenSlideJNI.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide; +package org.openslide; import java.io.InputStream; import java.io.IOException; diff --git a/src/edu/cmu/cs/openslide/TestCLI.java b/src/org/openslide/TestCLI.java similarity index 98% rename from src/edu/cmu/cs/openslide/TestCLI.java rename to src/org/openslide/TestCLI.java index ef41c31..d54ffbf 100644 --- a/src/edu/cmu/cs/openslide/TestCLI.java +++ b/src/org/openslide/TestCLI.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide; +package org.openslide; import java.io.File; import java.io.IOException; diff --git a/src/org/openslide/dzi/DeepZoomGenerator.java b/src/org/openslide/dzi/DeepZoomGenerator.java index 2066e29..7a6acdf 100644 --- a/src/org/openslide/dzi/DeepZoomGenerator.java +++ b/src/org/openslide/dzi/DeepZoomGenerator.java @@ -35,7 +35,7 @@ import javax.imageio.ImageIO; -import edu.cmu.cs.openslide.OpenSlide; +import org.openslide.OpenSlide; public class DeepZoomGenerator { diff --git a/src/edu/cmu/cs/openslide/gui/Annotation.java b/src/org/openslide/gui/Annotation.java similarity index 96% rename from src/edu/cmu/cs/openslide/gui/Annotation.java rename to src/org/openslide/gui/Annotation.java index 977b36a..0f87f3b 100644 --- a/src/edu/cmu/cs/openslide/gui/Annotation.java +++ b/src/org/openslide/gui/Annotation.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide.gui; +package org.openslide.gui; import java.awt.Shape; diff --git a/src/edu/cmu/cs/openslide/gui/DefaultAnnotation.java b/src/org/openslide/gui/DefaultAnnotation.java similarity index 97% rename from src/edu/cmu/cs/openslide/gui/DefaultAnnotation.java rename to src/org/openslide/gui/DefaultAnnotation.java index 827117d..e81ded1 100644 --- a/src/edu/cmu/cs/openslide/gui/DefaultAnnotation.java +++ b/src/org/openslide/gui/DefaultAnnotation.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide.gui; +package org.openslide.gui; import java.awt.Shape; diff --git a/src/edu/cmu/cs/openslide/gui/DefaultSelectionListModel.java b/src/org/openslide/gui/DefaultSelectionListModel.java similarity index 98% rename from src/edu/cmu/cs/openslide/gui/DefaultSelectionListModel.java rename to src/org/openslide/gui/DefaultSelectionListModel.java index abc7f3e..0098bec 100644 --- a/src/edu/cmu/cs/openslide/gui/DefaultSelectionListModel.java +++ b/src/org/openslide/gui/DefaultSelectionListModel.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide.gui; +package org.openslide.gui; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/edu/cmu/cs/openslide/gui/Demo.java b/src/org/openslide/gui/Demo.java similarity index 99% rename from src/edu/cmu/cs/openslide/gui/Demo.java rename to src/org/openslide/gui/Demo.java index 3bf375f..968f341 100644 --- a/src/edu/cmu/cs/openslide/gui/Demo.java +++ b/src/org/openslide/gui/Demo.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide.gui; +package org.openslide.gui; import java.awt.BorderLayout; import java.awt.event.*; @@ -31,7 +31,7 @@ import javax.swing.*; -import edu.cmu.cs.openslide.OpenSlide; +import org.openslide.OpenSlide; public class Demo { public static void main(final String[] args) { diff --git a/src/edu/cmu/cs/openslide/gui/OpenSlideView.java b/src/org/openslide/gui/OpenSlideView.java similarity index 99% rename from src/edu/cmu/cs/openslide/gui/OpenSlideView.java rename to src/org/openslide/gui/OpenSlideView.java index b87de85..bf0921c 100644 --- a/src/edu/cmu/cs/openslide/gui/OpenSlideView.java +++ b/src/org/openslide/gui/OpenSlideView.java @@ -24,7 +24,7 @@ * slides, non-pixel-perfect scrolling. */ -package edu.cmu.cs.openslide.gui; +package org.openslide.gui; import java.awt.*; import java.awt.event.*; @@ -37,7 +37,7 @@ import javax.swing.*; -import edu.cmu.cs.openslide.OpenSlide; +import org.openslide.OpenSlide; public class OpenSlideView extends JPanel { private static final int KEYBOARD_SCROLL_AMOUNT = 100; diff --git a/src/edu/cmu/cs/openslide/gui/SelectionListModel.java b/src/org/openslide/gui/SelectionListModel.java similarity index 97% rename from src/edu/cmu/cs/openslide/gui/SelectionListModel.java rename to src/org/openslide/gui/SelectionListModel.java index be650c1..35cd563 100644 --- a/src/edu/cmu/cs/openslide/gui/SelectionListModel.java +++ b/src/org/openslide/gui/SelectionListModel.java @@ -19,7 +19,7 @@ * */ -package edu.cmu.cs.openslide.gui; +package org.openslide.gui; import javax.swing.ListModel;