|
From: <bma...@us...> - 2013-05-16 21:38:02
|
Revision: 8408
http://sourceforge.net/p/fudaa/svn/8408
Author: bmarchan
Date: 2013-05-16 21:37:59 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Fix : Ecriture/lecture des fichiers binaires en fonction de ByteOrder.nativeOrder() et non plus en fonction du nom de l'architecture.
Modified Paths:
--------------
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/io/MatisseReader.java
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java 2013-05-16 21:35:21 UTC (rev 8407)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java 2013-05-16 21:37:59 UTC (rev 8408)
@@ -109,7 +109,7 @@
public void setFile(final File _f) {
analyze_ = new CtuluAnalyze();
try {
- out_ = new FortranBinaryOutputStream(new FileOutputStream(_f), false,NativeBinarySystem.getLocalMachineId());
+ out_ = new FortranBinaryOutputStream(new FileOutputStream(_f), false);
} catch (final FileNotFoundException e) {
e.printStackTrace();
}
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/io/MatisseReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/io/MatisseReader.java 2013-05-16 21:35:21 UTC (rev 8407)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/io/MatisseReader.java 2013-05-16 21:37:59 UTC (rev 8408)
@@ -15,6 +15,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.List;
@@ -30,7 +31,6 @@
import org.fudaa.ctulu.gis.GISPolyligne;
import org.fudaa.ctulu.gis.GISZone;
import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
-
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.NativeBinarySystem;
import org.fudaa.dodico.fortran.FortranBinaryInputStream;
@@ -45,7 +45,7 @@
*/
public class MatisseReader extends FileReadOperationAbstract implements CtuluActivity {
- private String machineID_;
+ private ByteOrder byteOrder_;
BufferedInputStream in_;
boolean stop_;
@@ -53,7 +53,7 @@
long totalSize_;
public MatisseReader() {
- machineID_ = NativeBinarySystem.getLocalMachineId();
+ byteOrder_ = NativeBinarySystem.getNativeByteOrder();
}
/**
@@ -78,7 +78,7 @@
private synchronized GISZone readMatisse() {
final GISZone r = new GISZone();
try {
- FortranBinaryInputStream in = new FortranBinaryInputStream(in_, false, machineID_);
+ FortranBinaryInputStream in = new FortranBinaryInputStream(in_, false, byteOrder_);
// TITRE
// Lecture du titre
// je ne sais pas a quoi sert les 5 premier bytes
@@ -90,13 +90,13 @@
int v2 = in.readInteger();
if (v2 > 2) {
// System.out.println("changement de format binaire");
- if (NativeBinarySystem.isSparc(machineID_)) {
- machineID_ = NativeBinarySystem.X86;
+ if (byteOrder_.equals(ByteOrder.LITTLE_ENDIAN)) {
+ byteOrder_ = ByteOrder.BIG_ENDIAN;
} else {
- machineID_ = NativeBinarySystem.SPARC;
+ byteOrder_ = ByteOrder.LITTLE_ENDIAN;
}
in_.reset();
- in = new FortranBinaryInputStream(in_, false, machineID_);
+ in = new FortranBinaryInputStream(in_, false, byteOrder_);
/* v1 = */in.readInt8();
v2 = in.readInteger();
if (v2 > 2) {
@@ -282,14 +282,6 @@
progress_.setProgression((int) (_pos * 100L / totalSize_));
}
- /**
- * @return l'identifiant de la machine
- * @see NativeBinarySystem#getLocalMachineId()
- */
- public String getMachineId() {
- return machineID_;
- }
-
@Override
public void setFile(final File _f) {
@@ -322,13 +314,4 @@
stop_ = true;
}
-
- /**
- * @param _id l'identifiant de la machine
- * @see NativeBinarySystem#getLocalMachineId()
- */
- public void setMachineId(final String _id) {
- machineID_ = NativeBinarySystem.getMachineId(_id);
- }
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|