Changeset 5648


Ignore:
Timestamp:
10/28/09 14:26:09 (10 years ago)
Author:
curtis
Message:

Cease blanket namespace usage, to avoid global name conflicts.

Location:
trunk/components/native/bf-cpp
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/native/bf-cpp/include/bio-formats.h

    r5569 r5648  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via JaceHeaderAutogen on Oct 8, 2009 11:52:54 PM CDT 
     27 * Created by curtis via JaceHeaderAutogen on Oct 28, 2009 2:24:12 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
     
    6868#include "jace/proxy/loci/formats/StatusReporter.h" 
    6969#include "jace/proxy/loci/formats/UnknownFormatException.h" 
    70 using namespace jace::proxy::loci::formats; 
     70#include "jace/proxy/loci/formats/WriterWrapper.h" 
     71//using namespace jace::proxy::loci::formats; 
    7172 
    7273#include "jace/proxy/loci/formats/cache/ByteArraySource.h" 
     
    8384#include "jace/proxy/loci/formats/cache/ICacheStrategy.h" 
    8485#include "jace/proxy/loci/formats/cache/RectangleStrategy.h" 
    85 using namespace jace::proxy::loci::formats::cache; 
     86//using namespace jace::proxy::loci::formats::cache; 
    8687 
    8788#include "jace/proxy/loci/formats/codec/Base64Codec.h" 
     
    111112#include "jace/proxy/loci/formats/codec/RPZACodec.h" 
    112113#include "jace/proxy/loci/formats/codec/ZlibCodec.h" 
    113 using namespace jace::proxy::loci::formats::codec; 
     114//using namespace jace::proxy::loci::formats::codec; 
     115 
     116#include "jace/proxy/loci/formats/enums/AcquisitionMode.h" 
     117#include "jace/proxy/loci/formats/enums/ArcType.h" 
     118#include "jace/proxy/loci/formats/enums/Binning.h" 
     119#include "jace/proxy/loci/formats/enums/ContrastMethod.h" 
     120#include "jace/proxy/loci/formats/enums/Correction.h" 
     121#include "jace/proxy/loci/formats/enums/DetectorType.h" 
     122#include "jace/proxy/loci/formats/enums/DimensionOrder.h" 
     123#include "jace/proxy/loci/formats/enums/Enumeration.h" 
     124#include "jace/proxy/loci/formats/enums/EnumerationException.h" 
     125#include "jace/proxy/loci/formats/enums/EnumerationProvider.h" 
     126#include "jace/proxy/loci/formats/enums/ExperimentType.h" 
     127#include "jace/proxy/loci/formats/enums/FilamentType.h" 
     128#include "jace/proxy/loci/formats/enums/FilterType.h" 
     129#include "jace/proxy/loci/formats/enums/FontFamily.h" 
     130#include "jace/proxy/loci/formats/enums/FontStyle.h" 
     131#include "jace/proxy/loci/formats/enums/IEnumerationProvider.h" 
     132#include "jace/proxy/loci/formats/enums/IlluminationType.h" 
     133#include "jace/proxy/loci/formats/enums/Immersion.h" 
     134#include "jace/proxy/loci/formats/enums/LaserMedium.h" 
     135#include "jace/proxy/loci/formats/enums/LaserType.h" 
     136#include "jace/proxy/loci/formats/enums/LineCap.h" 
     137#include "jace/proxy/loci/formats/enums/Marker.h" 
     138#include "jace/proxy/loci/formats/enums/Medium.h" 
     139#include "jace/proxy/loci/formats/enums/MicrobeamManipulationType.h" 
     140#include "jace/proxy/loci/formats/enums/MicroscopeType.h" 
     141#include "jace/proxy/loci/formats/enums/NamingConvention.h" 
     142#include "jace/proxy/loci/formats/enums/PixelType.h" 
     143#include "jace/proxy/loci/formats/enums/Pulse.h" 
     144//using namespace jace::proxy::loci::formats::enums; 
     145 
     146#include "jace/proxy/loci/formats/enums/handler/AcquisitionModeEnumHandler.h" 
     147#include "jace/proxy/loci/formats/enums/handler/ArcTypeEnumHandler.h" 
     148#include "jace/proxy/loci/formats/enums/handler/BinningEnumHandler.h" 
     149#include "jace/proxy/loci/formats/enums/handler/ContrastMethodEnumHandler.h" 
     150#include "jace/proxy/loci/formats/enums/handler/CorrectionEnumHandler.h" 
     151#include "jace/proxy/loci/formats/enums/handler/DetectorTypeEnumHandler.h" 
     152#include "jace/proxy/loci/formats/enums/handler/DimensionOrderEnumHandler.h" 
     153#include "jace/proxy/loci/formats/enums/handler/ExperimentTypeEnumHandler.h" 
     154#include "jace/proxy/loci/formats/enums/handler/FilamentTypeEnumHandler.h" 
     155#include "jace/proxy/loci/formats/enums/handler/FilterTypeEnumHandler.h" 
     156#include "jace/proxy/loci/formats/enums/handler/FontFamilyEnumHandler.h" 
     157#include "jace/proxy/loci/formats/enums/handler/FontStyleEnumHandler.h" 
     158#include "jace/proxy/loci/formats/enums/handler/IEnumerationHandler.h" 
     159#include "jace/proxy/loci/formats/enums/handler/IlluminationTypeEnumHandler.h" 
     160#include "jace/proxy/loci/formats/enums/handler/ImmersionEnumHandler.h" 
     161#include "jace/proxy/loci/formats/enums/handler/LaserMediumEnumHandler.h" 
     162#include "jace/proxy/loci/formats/enums/handler/LaserTypeEnumHandler.h" 
     163#include "jace/proxy/loci/formats/enums/handler/LineCapEnumHandler.h" 
     164#include "jace/proxy/loci/formats/enums/handler/MarkerEnumHandler.h" 
     165#include "jace/proxy/loci/formats/enums/handler/MediumEnumHandler.h" 
     166#include "jace/proxy/loci/formats/enums/handler/MicrobeamManipulationTypeEnumHandler.h" 
     167#include "jace/proxy/loci/formats/enums/handler/MicroscopeTypeEnumHandler.h" 
     168#include "jace/proxy/loci/formats/enums/handler/NamingConventionEnumHandler.h" 
     169#include "jace/proxy/loci/formats/enums/handler/PixelTypeEnumHandler.h" 
     170#include "jace/proxy/loci/formats/enums/handler/PulseEnumHandler.h" 
     171//using namespace jace::proxy::loci::formats::enums::handler; 
    114172 
    115173#include "jace/proxy/loci/formats/gui/AWTImageTools.h" 
     
    117175#include "jace/proxy/loci/formats/gui/BufferedImageReader.h" 
    118176#include "jace/proxy/loci/formats/gui/BufferedImageSource.h" 
     177#include "jace/proxy/loci/formats/gui/BufferedImageWriter.h" 
    119178#include "jace/proxy/loci/formats/gui/CacheComponent.h" 
    120179#include "jace/proxy/loci/formats/gui/CacheIndicator.h" 
     
    137196#include "jace/proxy/loci/formats/gui/XMLCellRenderer.h" 
    138197#include "jace/proxy/loci/formats/gui/XMLWindow.h" 
    139 using namespace jace::proxy::loci::formats::gui; 
     198//using namespace jace::proxy::loci::formats::gui; 
    140199 
    141200#include "jace/proxy/loci/formats/in/APLReader.h" 
     
    218277#include "jace/proxy/loci/formats/in/SEQReader.h" 
    219278#include "jace/proxy/loci/formats/in/SVSReader.h" 
     279#include "jace/proxy/loci/formats/in/ScanrReader.h" 
    220280#include "jace/proxy/loci/formats/in/SlidebookReader.h" 
    221281#include "jace/proxy/loci/formats/in/TCSReader.h" 
     
    226286#include "jace/proxy/loci/formats/in/ZeissZVIReader.h" 
    227287#include "jace/proxy/loci/formats/in/ZipReader.h" 
    228 using namespace jace::proxy::loci::formats::in; 
     288//using namespace jace::proxy::loci::formats::in; 
    229289 
    230290#include "jace/proxy/loci/formats/meta/AggregateMetadata.h" 
     
    236296#include "jace/proxy/loci/formats/meta/MetadataRetrieve.h" 
    237297#include "jace/proxy/loci/formats/meta/MetadataStore.h" 
    238 using namespace jace::proxy::loci::formats::meta; 
     298//using namespace jace::proxy::loci::formats::meta; 
    239299 
    240300#include "jace/proxy/loci/formats/ome/OMEXML2003FCMetadata.h" 
     
    245305#include "jace/proxy/loci/formats/ome/OmeisException.h" 
    246306#include "jace/proxy/loci/formats/ome/OmeisImporter.h" 
    247 using namespace jace::proxy::loci::formats::ome; 
     307//using namespace jace::proxy::loci::formats::ome; 
    248308 
    249309#include "jace/proxy/loci/formats/out/APNGWriter.h" 
     
    259319#include "jace/proxy/loci/formats/out/QTWriter.h" 
    260320#include "jace/proxy/loci/formats/out/TiffWriter.h" 
    261 using namespace jace::proxy::loci::formats::out; 
     321//using namespace jace::proxy::loci::formats::out; 
    262322 
    263323#include "jace/proxy/loci/formats/tiff/IFD.h" 
     
    271331#include "jace/proxy/loci/formats/tiff/TiffSaver.h" 
    272332#include "jace/proxy/loci/formats/tiff/TiffTools.h" 
    273 using namespace jace::proxy::loci::formats::tiff; 
     333//using namespace jace::proxy::loci::formats::tiff; 
    274334 
    275335#include "jace/proxy/loci/formats/tools/AmiraParameters.h" 
     
    284344#include "jace/proxy/loci/formats/tools/XMLIndent.h" 
    285345#include "jace/proxy/loci/formats/tools/XMLValidate.h" 
    286 using namespace jace::proxy::loci::formats::tools; 
     346//using namespace jace::proxy::loci::formats::tools; 
    287347 
    288348#endif 
  • trunk/components/native/bf-cpp/include/jace.h

    r5338 r5648  
    3131#include "jace/OptionList.h" 
    3232#include "jace/StaticVmLoader.h" 
    33 using namespace jace; 
     33//using namespace jace; 
    3434 
    3535#include "jace/proxy/types/JBoolean.h" 
     
    4242#include "jace/proxy/types/JShort.h" 
    4343#include "jace/proxy/types/JVoid.h" 
    44 using namespace jace::proxy::types; 
     44//using namespace jace::proxy::types; 
    4545 
    46 typedef JArray<JBoolean> BooleanArray; 
    47 typedef JArray<BooleanArray> BooleanArray2D; 
    48 typedef JArray<BooleanArray2D> BooleanArray3D; 
    49 typedef JArray<BooleanArray3D> BooleanArray4D; 
    50 typedef JArray<JByte> ByteArray; 
    51 typedef JArray<ByteArray> ByteArray2D; 
    52 typedef JArray<ByteArray2D> ByteArray3D; 
    53 typedef JArray<ByteArray3D> ByteArray4D; 
    54 typedef JArray<JChar> CharArray; 
    55 typedef JArray<CharArray> CharArray2D; 
    56 typedef JArray<CharArray2D> CharArray3D; 
    57 typedef JArray<CharArray3D> CharArray4D; 
    58 typedef JArray<JDouble> DoubleArray; 
    59 typedef JArray<DoubleArray> DoubleArray2D; 
    60 typedef JArray<DoubleArray2D> DoubleArray3D; 
    61 typedef JArray<DoubleArray3D> DoubleArray4D; 
    62 typedef JArray<JFloat> FloatArray; 
    63 typedef JArray<FloatArray> FloatArray2D; 
    64 typedef JArray<FloatArray2D> FloatArray3D; 
    65 typedef JArray<FloatArray3D> FloatArray4D; 
    66 typedef JArray<JInt> IntArray; 
    67 typedef JArray<IntArray> IntArray2D; 
    68 typedef JArray<IntArray2D> IntArray3D; 
    69 typedef JArray<IntArray3D> IntArray4D; 
    70 typedef JArray<JLong> LongArray; 
    71 typedef JArray<LongArray> LongArray2D; 
    72 typedef JArray<LongArray2D> LongArray3D; 
    73 typedef JArray<LongArray3D> LongArray4D; 
    74 typedef JArray<JShort> ShortArray; 
    75 typedef JArray<ShortArray> ShortArray2D; 
    76 typedef JArray<ShortArray2D> ShortArray3D; 
    77 typedef JArray<ShortArray3D> ShortArray4D; 
     46typedef jace::JArray<jace::proxy::types::JBoolean> BooleanArray; 
     47typedef jace::JArray<BooleanArray> BooleanArray2D; 
     48typedef jace::JArray<BooleanArray2D> BooleanArray3D; 
     49typedef jace::JArray<BooleanArray3D> BooleanArray4D; 
     50typedef jace::JArray<jace::proxy::types::JByte> ByteArray; 
     51typedef jace::JArray<ByteArray> ByteArray2D; 
     52typedef jace::JArray<ByteArray2D> ByteArray3D; 
     53typedef jace::JArray<ByteArray3D> ByteArray4D; 
     54typedef jace::JArray<jace::proxy::types::JChar> CharArray; 
     55typedef jace::JArray<CharArray> CharArray2D; 
     56typedef jace::JArray<CharArray2D> CharArray3D; 
     57typedef jace::JArray<CharArray3D> CharArray4D; 
     58typedef jace::JArray<jace::proxy::types::JDouble> DoubleArray; 
     59typedef jace::JArray<DoubleArray> DoubleArray2D; 
     60typedef jace::JArray<DoubleArray2D> DoubleArray3D; 
     61typedef jace::JArray<DoubleArray3D> DoubleArray4D; 
     62typedef jace::JArray<jace::proxy::types::JFloat> FloatArray; 
     63typedef jace::JArray<FloatArray> FloatArray2D; 
     64typedef jace::JArray<FloatArray2D> FloatArray3D; 
     65typedef jace::JArray<FloatArray3D> FloatArray4D; 
     66typedef jace::JArray<jace::proxy::types::JInt> IntArray; 
     67typedef jace::JArray<IntArray> IntArray2D; 
     68typedef jace::JArray<IntArray2D> IntArray3D; 
     69typedef jace::JArray<IntArray3D> IntArray4D; 
     70typedef jace::JArray<jace::proxy::types::JLong> LongArray; 
     71typedef jace::JArray<LongArray> LongArray2D; 
     72typedef jace::JArray<LongArray2D> LongArray3D; 
     73typedef jace::JArray<LongArray3D> LongArray4D; 
     74typedef jace::JArray<jace::proxy::types::JShort> ShortArray; 
     75typedef jace::JArray<ShortArray> ShortArray2D; 
     76typedef jace::JArray<ShortArray2D> ShortArray3D; 
     77typedef jace::JArray<ShortArray3D> ShortArray4D; 
    7878 
    7979#include "jace/proxy/java/lang/Boolean.h" 
     
    8686#include "jace/proxy/java/lang/Short.h" 
    8787#include "jace/proxy/java/lang/String.h" 
    88 using namespace jace::proxy::java::lang; 
     88//using namespace jace::proxy::java::lang; 
    8989 
    90 typedef JArray<String> StringArray; 
    91 typedef JArray<StringArray> StringArray2D; 
    92 typedef JArray<StringArray2D> StringArray3D; 
    93 typedef JArray<StringArray3D> StringArray4D; 
     90typedef jace::JArray<jace::proxy::java::lang::String> StringArray; 
     91typedef jace::JArray<StringArray> StringArray2D; 
     92typedef jace::JArray<StringArray2D> StringArray3D; 
     93typedef jace::JArray<StringArray3D> StringArray4D; 
    9494 
    9595#include "jace/proxy/java/io/IOException.h" 
    96 using namespace jace::proxy::java::io; 
     96//using namespace jace::proxy::java::io; 
    9797 
    9898#include "jace/proxy/java/util/Hashtable.h" 
    99 using namespace jace::proxy::java::util; 
     99//using namespace jace::proxy::java::util; 
    100100 
    101101#endif 
  • trunk/components/native/bf-cpp/include/loci-common.h

    r5542 r5648  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by melissa via JaceHeaderAutogen on Oct 2, 2009 8:39:17 AM CDT 
     27 * Created by curtis via JaceHeaderAutogen on Oct 28, 2009 2:24:12 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
     
    6060#include "jace/proxy/loci/common/XMLTools.h" 
    6161#include "jace/proxy/loci/common/ZipHandle.h" 
    62 using namespace jace::proxy::loci::common; 
     62//using namespace jace::proxy::loci::common; 
    6363 
    6464#endif 
  • trunk/components/native/bf-cpp/source/minimum_writer.cpp

    r5602 r5648  
    2828// for Bio-Formats C++ bindings 
    2929#include "bio-formats.h" 
    30 #include "loci-common.h" 
     30using jace::JNIException; 
     31using jace::proxy::java::io::IOException; 
     32using jace::proxy::java::lang::Boolean; 
     33using jace::proxy::java::lang::Integer; 
     34using jace::proxy::loci::formats::FormatException; 
     35using jace::proxy::loci::formats::FormatTools; 
     36using jace::proxy::loci::formats::ImageWriter; 
     37using jace::proxy::loci::formats::MetadataTools; 
     38using jace::proxy::loci::formats::meta::IMetadata; 
    3139 
    3240#include <iostream> 
     
    5260void createJVM() { 
    5361  cout << "Creating JVM... "; 
    54   StaticVmLoader loader(JNI_VERSION_1_4); 
    55   OptionList list; 
     62  jace::StaticVmLoader loader(JNI_VERSION_1_4); 
     63  jace::OptionList list; 
    5664  list.push_back(jace::ClassPath( 
    5765    "jace-runtime.jar" + PATHSEP + 
     
    8492  //byte[] img = new byte[w * h * FormatTools.getBytesPerPixel(pixelType)]; 
    8593  int planeSize = w * h * FormatTools::getBytesPerPixel(pixelType); 
    86   JArray<JByte> img(planeSize); // pre-allocate buffer 
     94  ByteArray img(planeSize); // pre-allocate buffer 
    8795 
    8896  // fill with random data 
  • trunk/components/native/bf-cpp/source/showinf.cpp

    r5608 r5648  
    2929#include "bio-formats.h" 
    3030#include "loci-common.h" 
     31using jace::JNIException; 
     32using jace::proxy::java::io::IOException; 
     33using jace::proxy::java::lang::Object; 
     34using jace::proxy::java::lang::String; 
     35using jace::proxy::java::util::Hashtable; 
     36using jace::proxy::loci::common::XMLTools; 
     37using jace::proxy::loci::formats::ChannelFiller; 
     38using jace::proxy::loci::formats::ChannelMerger; 
     39using jace::proxy::loci::formats::ChannelSeparator; 
     40using jace::proxy::loci::formats::DimensionSwapper; 
     41using jace::proxy::loci::formats::FilePattern; 
     42using jace::proxy::loci::formats::FileStitcher; 
     43using jace::proxy::loci::formats::FormatException; 
     44using jace::proxy::loci::formats::FormatTools; 
     45using jace::proxy::loci::formats::IFormatHandler; 
     46using jace::proxy::loci::formats::IFormatReader; 
     47using jace::proxy::loci::formats::ImageReader; 
     48using jace::proxy::loci::formats::MetadataTools; 
     49using jace::proxy::loci::formats::meta::MetadataRetrieve; 
     50using jace::proxy::loci::formats::meta::MetadataStore; 
     51using jace::proxy::loci::formats::tools::StatusEchoer; 
    3152 
    3253#include <iostream> 
     
    93114void createJVM() { 
    94115  cout << "Creating JVM... "; 
    95   StaticVmLoader loader(JNI_VERSION_1_4); 
    96   OptionList list; 
     116  jace::StaticVmLoader loader(JNI_VERSION_1_4); 
     117  jace::OptionList list; 
    97118  list.push_back(jace::ClassPath( 
    98119    "jace-runtime.jar" + PATHSEP + 
Note: See TracChangeset for help on using the changeset viewer.