From ce38c104428ab10d93d5d3ac5a44e4ef86c9dd6f Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Wed, 14 Mar 2012 21:26:28 -0500 Subject: [PATCH] Internalize lttng.jni --- .../core/tests/headless/JniTraceTest.java | 3 +- .../lttng/core/tests/jni/Combinations.java | 2 +- .../lttng/core/tests/jni/JniEventTest.java | 4 +-- .../core/tests/jni/JniMarkerFieldTest.java | 2 +- .../lttng/core/tests/jni/JniMarkerTest.java | 2 +- .../lttng/core/tests/jni/JniTraceTest.java | 4 +-- .../core/tests/jni/JniTracefileTest.java | 4 +-- .../internal/lttng/core/trace/LTTngTrace.java | 4 +-- .../lttng/core/trace/LTTngTraceVersion.java | 2 +- .../META-INF/MANIFEST.MF | 12 ++++---- .../lttng/jni/common/JniTime.java | 2 +- .../lttng/jni/common/Jni_C_Constant.java | 2 +- .../lttng/jni/common/Jni_C_Pointer.java | 2 +- .../common/Jni_C_Pointer_And_Library_Id.java | 2 +- .../jni/exception/JniEventException.java | 2 +- .../JniEventOutOfRangeException.java | 2 +- .../lttng/jni/exception/JniException.java | 2 +- .../jni/exception/JniMarkerException.java | 2 +- .../exception/JniMarkerFieldException.java | 2 +- .../JniNoNextEventInTraceException.java | 2 +- .../exception/JniNoSuchEventException.java | 2 +- .../JniOpenTraceFailedException.java | 2 +- .../jni/exception/JniTraceException.java | 2 +- .../exception/JniTraceVersionException.java | 2 +- .../jni/exception/JniTracefileException.java | 2 +- .../JniTracefileWithoutEventException.java | 2 +- .../lttng/jni_v2_3/JniEvent_v2_3.java | 6 ++-- .../lttng/jni_v2_3/JniMarkerField_v2_3.java | 6 ++-- .../lttng/jni_v2_3/JniMarker_v2_3.java | 6 ++-- .../lttng/jni_v2_3/JniParser_v2_3.java | 2 +- .../lttng/jni_v2_3/JniTrace_v2_3.java | 6 ++-- .../lttng/jni_v2_3/JniTracefile_v2_3.java | 6 ++-- .../lttng/jni_v2_5/JniEvent_v2_5.java | 6 ++-- .../lttng/jni_v2_5/JniMarkerField_v2_5.java | 6 ++-- .../lttng/jni_v2_5/JniMarker_v2_5.java | 6 ++-- .../lttng/jni_v2_5/JniParser_v2_5.java | 2 +- .../lttng/jni_v2_5/JniTrace_v2_5.java | 6 ++-- .../lttng/jni_v2_5/JniTracefile_v2_5.java | 6 ++-- .../lttng/jni_v2_6/JniEvent_v2_6.java | 6 ++-- .../lttng/jni_v2_6/JniMarkerField_v2_6.java | 6 ++-- .../lttng/jni_v2_6/JniMarker_v2_6.java | 6 ++-- .../lttng/jni_v2_6/JniParser_v2_6.java | 2 +- .../lttng/jni_v2_6/JniTrace_v2_6.java | 6 ++-- .../lttng/jni_v2_6/JniTracefile_v2_6.java | 6 ++-- .../linuxtools/lttng/jni/JniEvent.java | 24 ++++++++-------- .../linuxtools/lttng/jni/JniMarker.java | 10 +++---- .../linuxtools/lttng/jni/JniMarkerField.java | 10 +++---- .../linuxtools/lttng/jni/JniParser.java | 2 +- .../linuxtools/lttng/jni/JniTrace.java | 28 +++++++++---------- .../linuxtools/lttng/jni/JniTracefile.java | 26 ++++++++--------- .../linuxtools/lttng/jni/Jni_C_Common.java | 2 +- .../lttng/jni/factory/JniTraceFactory.java | 10 +++---- .../lttng/jni/factory/JniTraceVersion.java | 4 +-- 53 files changed, 142 insertions(+), 141 deletions(-) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/common/JniTime.java (98%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/common/Jni_C_Constant.java (96%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/common/Jni_C_Pointer.java (97%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/common/Jni_C_Pointer_And_Library_Id.java (97%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniEventException.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniEventOutOfRangeException.java (94%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniException.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniMarkerException.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniMarkerFieldException.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniNoNextEventInTraceException.java (94%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniNoSuchEventException.java (94%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniOpenTraceFailedException.java (94%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniTraceException.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniTraceVersionException.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniTracefileException.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni/exception/JniTracefileWithoutEventException.java (94%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_3/JniEvent_v2_3.java (86%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_3/JniMarkerField_v2_3.java (85%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_3/JniMarker_v2_3.java (89%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_3/JniParser_v2_3.java (94%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_3/JniTrace_v2_3.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_3/JniTracefile_v2_3.java (92%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_5/JniEvent_v2_5.java (86%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_5/JniMarkerField_v2_5.java (85%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_5/JniMarker_v2_5.java (89%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_5/JniParser_v2_5.java (94%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_5/JniTrace_v2_5.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_5/JniTracefile_v2_5.java (92%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_6/JniEvent_v2_6.java (86%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_6/JniMarkerField_v2_6.java (85%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_6/JniMarker_v2_6.java (89%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_6/JniParser_v2_6.java (94%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_6/JniTrace_v2_6.java (93%) rename org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/{ => internal}/lttng/jni_v2_6/JniTracefile_v2_6.java (92%) diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java index 5fc59c6cc4..4fea922811 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java @@ -12,10 +12,11 @@ package org.eclipse.linuxtools.lttng.core.tests.headless; *******************************************************************************/ import java.util.ArrayList; + +import org.eclipse.linuxtools.internal.lttng.jni.common.JniTime; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; import org.eclipse.linuxtools.lttng.jni.JniTrace; -import org.eclipse.linuxtools.lttng.jni.common.JniTime; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java index a3b0c1a782..d31264ed12 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java @@ -9,11 +9,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; import org.eclipse.linuxtools.lttng.jni.JniTrace; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java index 0ef45dc516..7d3815ec59 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java @@ -33,10 +33,10 @@ package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; +import org.eclipse.linuxtools.internal.lttng.jni.common.JniTime; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; @SuppressWarnings("nls") diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java index 569fdfeb21..e6b0a6fe46 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java @@ -4,10 +4,10 @@ package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; /* diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java index 927c9c70a4..30aed0b6a3 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java @@ -4,9 +4,9 @@ package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; /* diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java index af59fd7d80..c4606eb194 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java @@ -1,9 +1,9 @@ package org.eclipse.linuxtools.lttng.core.tests.jni; +import org.eclipse.linuxtools.internal.lttng.jni.common.JniTime; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniTrace; -import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java index bdd7adf728..e9fc45fada 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java @@ -3,10 +3,10 @@ package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; +import org.eclipse.linuxtools.internal.lttng.jni.common.JniTime; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; /* diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTrace.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTrace.java index c6adf10a21..fae7b95305 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTrace.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTrace.java @@ -27,12 +27,12 @@ import org.eclipse.linuxtools.internal.lttng.core.event.LttngLocation; import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp; import org.eclipse.linuxtools.internal.lttng.core.exceptions.LttngException; import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility.LiveTraceManager; +import org.eclipse.linuxtools.internal.lttng.jni.common.JniTime; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTraceVersion.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTraceVersion.java index 3f83b14da7..06b825b618 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTraceVersion.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTraceVersion.java @@ -13,7 +13,7 @@ package org.eclipse.linuxtools.internal.lttng.core.trace; *******************************************************************************/ import org.eclipse.linuxtools.internal.lttng.core.exceptions.LttngException; -import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniTraceVersionException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceVersion; /** diff --git a/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF index 4c22dcfcfc..c0b35c804a 100644 --- a/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF @@ -4,12 +4,12 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.lttng.jni Bundle-Version: 0.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.linuxtools.lttng.jni, - org.eclipse.linuxtools.lttng.jni.common, - org.eclipse.linuxtools.lttng.jni.exception, - org.eclipse.linuxtools.lttng.jni.factory, - org.eclipse.linuxtools.lttng.jni_v2_3, - org.eclipse.linuxtools.lttng.jni_v2_5 +Export-Package: org.eclipse.linuxtools.internal.lttng.jni.common;x-friends:="org.eclipse.linuxtools.lttng.core,org.eclipse.linuxtools.lttng.core.tests", + org.eclipse.linuxtools.internal.lttng.jni.exception;x-friends:="org.eclipse.linuxtools.lttng.core,org.eclipse.linuxtools.lttng.core.tests", + org.eclipse.linuxtools.internal.lttng.jni_v2_3;x-internal:=true, + org.eclipse.linuxtools.internal.lttng.jni_v2_5;x-internal:=true, + org.eclipse.linuxtools.lttng.jni;x-friends:="org.eclipse.linuxtools.lttng.core,org.eclipse.linuxtools.lttng.core.tests", + org.eclipse.linuxtools.lttng.jni.factory;x-friends:="org.eclipse.linuxtools.lttng.core,org.eclipse.linuxtools.lttng.core.tests" Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/JniTime.java similarity index 98% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/JniTime.java index 5279940d3c..0b649aa155 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/JniTime.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.common; +package org.eclipse.linuxtools.internal.lttng.jni.common; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Constant.java similarity index 96% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Constant.java index dd3609c758..932c58942d 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Constant.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.common; +package org.eclipse.linuxtools.internal.lttng.jni.common; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Pointer.java similarity index 97% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Pointer.java index b04be0f4b1..c0bae4e383 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Pointer.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.common; +package org.eclipse.linuxtools.internal.lttng.jni.common; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer_And_Library_Id.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Pointer_And_Library_Id.java similarity index 97% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer_And_Library_Id.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Pointer_And_Library_Id.java index 6e7f1d48ec..ab00652ae5 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer_And_Library_Id.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/common/Jni_C_Pointer_And_Library_Id.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.common; +package org.eclipse.linuxtools.internal.lttng.jni.common; public class Jni_C_Pointer_And_Library_Id extends Jni_C_Pointer { diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniEventException.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniEventException.java index f87ef318a1..09e1f07ce2 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniEventException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventOutOfRangeException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniEventOutOfRangeException.java similarity index 94% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventOutOfRangeException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniEventOutOfRangeException.java index ccd8b996fc..d868cb2e07 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventOutOfRangeException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniEventOutOfRangeException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniException.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniException.java index 1ba46b7d42..a556fcdd53 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniMarkerException.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniMarkerException.java index b6f009b926..9158b32365 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniMarkerException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerFieldException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniMarkerFieldException.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerFieldException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniMarkerFieldException.java index 123e4714c2..5d59c83393 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerFieldException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniMarkerFieldException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoNextEventInTraceException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniNoNextEventInTraceException.java similarity index 94% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoNextEventInTraceException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniNoNextEventInTraceException.java index 76aaa5e28f..547d0c4af1 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoNextEventInTraceException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniNoNextEventInTraceException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoSuchEventException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniNoSuchEventException.java similarity index 94% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoSuchEventException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniNoSuchEventException.java index 478d07953a..e0e081f2d8 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoSuchEventException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniNoSuchEventException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniOpenTraceFailedException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniOpenTraceFailedException.java similarity index 94% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniOpenTraceFailedException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniOpenTraceFailedException.java index 963f703b5f..0d6b1f60cc 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniOpenTraceFailedException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniOpenTraceFailedException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTraceException.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTraceException.java index b89cd0c78f..5375a6151b 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTraceException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceVersionException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTraceVersionException.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceVersionException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTraceVersionException.java index 2eb3916545..c36c04f014 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceVersionException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTraceVersionException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTracefileException.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTracefileException.java index 54a26a73dd..71661fe69b 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTracefileException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileWithoutEventException.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTracefileWithoutEventException.java similarity index 94% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileWithoutEventException.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTracefileWithoutEventException.java index e8cc5227d6..a555c98cd6 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileWithoutEventException.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni/exception/JniTracefileWithoutEventException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni.exception; +package org.eclipse.linuxtools.internal.lttng.jni.exception; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniEvent_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniEvent_v2_3.java similarity index 86% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniEvent_v2_3.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniEvent_v2_3.java index c37168b400..cddef41df8 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniEvent_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniEvent_v2_3.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_3; +package org.eclipse.linuxtools.internal.lttng.jni_v2_3; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -13,11 +13,11 @@ package org.eclipse.linuxtools.lttng.jni_v2_3; import java.util.HashMap; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniEvent_v2_3 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarkerField_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniMarkerField_v2_3.java similarity index 85% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarkerField_v2_3.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniMarkerField_v2_3.java index c67e0a7de1..56d4332702 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarkerField_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniMarkerField_v2_3.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_3; +package org.eclipse.linuxtools.internal.lttng.jni_v2_3; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -11,9 +11,9 @@ package org.eclipse.linuxtools.lttng.jni_v2_3; * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniMarkerField_v2_3 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniMarker_v2_3.java similarity index 89% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniMarker_v2_3.java index 58ca0655a2..080892a7e8 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniMarker_v2_3.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_3; +package org.eclipse.linuxtools.internal.lttng.jni_v2_3; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -11,10 +11,10 @@ package org.eclipse.linuxtools.lttng.jni_v2_3; * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniMarker_v2_3 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniParser_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniParser_v2_3.java similarity index 94% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniParser_v2_3.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniParser_v2_3.java index d00636e4be..710137ede5 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniParser_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniParser_v2_3.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_3; +package org.eclipse.linuxtools.internal.lttng.jni_v2_3; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniTrace_v2_3.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniTrace_v2_3.java index f99efa009c..b0058224e3 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniTrace_v2_3.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_3; +package org.eclipse.linuxtools.internal.lttng.jni_v2_3; /******************************************************************************* * Copyright (c) 2009, 2011 Ericsson, MontaVista Software * @@ -13,10 +13,10 @@ package org.eclipse.linuxtools.lttng.jni_v2_3; * Yufen Kuo (ykuo@mvista.com) - bug 340341: handle gracefully when native library failed to initialize *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniTrace_v2_3 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniTracefile_v2_3.java similarity index 92% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniTracefile_v2_3.java index 44254572b4..2b62e15039 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_3/JniTracefile_v2_3.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_3; +package org.eclipse.linuxtools.internal.lttng.jni_v2_3; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -13,12 +13,12 @@ package org.eclipse.linuxtools.lttng.jni_v2_3; import java.util.HashMap; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniTracefile_v2_3 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniEvent_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniEvent_v2_5.java similarity index 86% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniEvent_v2_5.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniEvent_v2_5.java index 6e3898af33..414a573600 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniEvent_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniEvent_v2_5.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_5; +package org.eclipse.linuxtools.internal.lttng.jni_v2_5; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -13,11 +13,11 @@ package org.eclipse.linuxtools.lttng.jni_v2_5; import java.util.HashMap; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniEvent_v2_5 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarkerField_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniMarkerField_v2_5.java similarity index 85% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarkerField_v2_5.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniMarkerField_v2_5.java index 8900dff6e4..5d089cb335 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarkerField_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniMarkerField_v2_5.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_5; +package org.eclipse.linuxtools.internal.lttng.jni_v2_5; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -11,9 +11,9 @@ package org.eclipse.linuxtools.lttng.jni_v2_5; * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniMarkerField_v2_5 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniMarker_v2_5.java similarity index 89% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniMarker_v2_5.java index d7dafc09a8..90cd806d7c 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniMarker_v2_5.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_5; +package org.eclipse.linuxtools.internal.lttng.jni_v2_5; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -11,10 +11,10 @@ package org.eclipse.linuxtools.lttng.jni_v2_5; * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniMarker_v2_5 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniParser_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniParser_v2_5.java similarity index 94% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniParser_v2_5.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniParser_v2_5.java index 81a62cbb77..3e8c9f99e7 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniParser_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniParser_v2_5.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_5; +package org.eclipse.linuxtools.internal.lttng.jni_v2_5; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniTrace_v2_5.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniTrace_v2_5.java index 0fd10b14be..6b78942996 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniTrace_v2_5.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_5; +package org.eclipse.linuxtools.internal.lttng.jni_v2_5; /******************************************************************************* * Copyright (c) 2009, 2011 Ericsson, MontaVista Software * @@ -13,10 +13,10 @@ package org.eclipse.linuxtools.lttng.jni_v2_5; * Yufen Kuo (ykuo@mvista.com) - bug 340341: handle gracefully when native library failed to initialize *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniTrace_v2_5 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniTracefile_v2_5.java similarity index 92% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniTracefile_v2_5.java index 6d63a22edd..7d712852cd 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_5/JniTracefile_v2_5.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_5; +package org.eclipse.linuxtools.internal.lttng.jni_v2_5; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -13,12 +13,12 @@ package org.eclipse.linuxtools.lttng.jni_v2_5; import java.util.HashMap; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniTracefile_v2_5 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniEvent_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniEvent_v2_6.java similarity index 86% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniEvent_v2_6.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniEvent_v2_6.java index fac4f8d8a7..b7edd7ad68 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniEvent_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniEvent_v2_6.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_6; +package org.eclipse.linuxtools.internal.lttng.jni_v2_6; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -13,11 +13,11 @@ package org.eclipse.linuxtools.lttng.jni_v2_6; import java.util.HashMap; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniEvent_v2_6 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarkerField_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniMarkerField_v2_6.java similarity index 85% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarkerField_v2_6.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniMarkerField_v2_6.java index cdff84ac60..d7350a3ce8 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarkerField_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniMarkerField_v2_6.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_6; +package org.eclipse.linuxtools.internal.lttng.jni_v2_6; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -11,9 +11,9 @@ package org.eclipse.linuxtools.lttng.jni_v2_6; * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniMarkerField_v2_6 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniMarker_v2_6.java similarity index 89% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniMarker_v2_6.java index 34ecf1f5f2..1425230c19 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniMarker_v2_6.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_6; +package org.eclipse.linuxtools.internal.lttng.jni_v2_6; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -11,10 +11,10 @@ package org.eclipse.linuxtools.lttng.jni_v2_6; * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniMarker_v2_6 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniParser_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniParser_v2_6.java similarity index 94% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniParser_v2_6.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniParser_v2_6.java index 4d3bc77e92..939bf95d7d 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniParser_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniParser_v2_6.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_6; +package org.eclipse.linuxtools.internal.lttng.jni_v2_6; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniTrace_v2_6.java similarity index 93% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniTrace_v2_6.java index caa39829d4..9edc5498c3 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniTrace_v2_6.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_6; +package org.eclipse.linuxtools.internal.lttng.jni_v2_6; /******************************************************************************* * Copyright (c) 2009, 2011 Ericsson, MontaVista Software * @@ -13,10 +13,10 @@ package org.eclipse.linuxtools.lttng.jni_v2_6; * Yufen Kuo (ykuo@mvista.com) - bug 340341: handle gracefully when native library failed to initialize *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniTrace_v2_6 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniTracefile_v2_6.java similarity index 92% rename from org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java rename to org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniTracefile_v2_6.java index 2aeebaa28a..6090235b99 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/internal/lttng/jni_v2_6/JniTracefile_v2_6.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.jni_v2_6; +package org.eclipse.linuxtools.internal.lttng.jni_v2_6; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -13,12 +13,12 @@ package org.eclipse.linuxtools.lttng.jni_v2_6; import java.util.HashMap; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; /** * JniTracefile_v2_6 diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java index 463bd11c07..247bf11880 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java @@ -14,11 +14,11 @@ package org.eclipse.linuxtools.lttng.jni; import java.util.HashMap; -import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniEventException; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; -import org.eclipse.linuxtools.lttng.jni.exception.JniNoSuchEventException; +import org.eclipse.linuxtools.internal.lttng.jni.common.JniTime; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniEventException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniNoSuchEventException; /** * JniEvent

@@ -120,7 +120,7 @@ public abstract class JniEvent extends Jni_C_Common implements ComparableJniMarker

@@ -168,7 +168,7 @@ public abstract class JniMarker extends Jni_C_Common * * @return The actual (long converted) pointer or NULL * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id */ public Jni_C_Pointer_And_Library_Id getMarkerPtr() { return thisMarkerPtr; @@ -241,7 +241,7 @@ public abstract class JniMarker extends Jni_C_Common * * @throws JniException The construction (allocation) failed. * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id * @see org.eclipse.linuxtools.lttng.jni.JniMarkerField */ public abstract JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer_And_Library_Id newMarkerFieldPtr) throws JniException; diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarkerField.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarkerField.java index 4840062bce..0e4f1b83c3 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarkerField.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarkerField.java @@ -1,8 +1,8 @@ package org.eclipse.linuxtools.lttng.jni; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; -import org.eclipse.linuxtools.lttng.jni.exception.JniMarkerFieldException; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniMarkerFieldException; /** @@ -66,7 +66,7 @@ public abstract class JniMarkerField extends Jni_C_Common * * @exception JniException * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id */ public JniMarkerField(Jni_C_Pointer_And_Library_Id newMarkerFieldPtr) throws JniException { thisMarkerFieldPtr = newMarkerFieldPtr; @@ -105,7 +105,7 @@ public abstract class JniMarkerField extends Jni_C_Common * * @return The actual (long converted) pointer or NULL * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id */ public Jni_C_Pointer_And_Library_Id getMarkerFieldPtr() { return thisMarkerFieldPtr; diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java index adeafd9ff5..b070b14ae5 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.lttng.jni; import java.util.HashMap; import java.util.Iterator; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer; /** * JniParser

diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java index febb99e485..bf335e5e28 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java @@ -20,12 +20,12 @@ import java.util.PriorityQueue; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; -import org.eclipse.linuxtools.lttng.jni.exception.JniOpenTraceFailedException; -import org.eclipse.linuxtools.lttng.jni.exception.JniTraceException; -import org.eclipse.linuxtools.lttng.jni.exception.JniTracefileWithoutEventException; +import org.eclipse.linuxtools.internal.lttng.jni.common.JniTime; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniOpenTraceFailedException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniTraceException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniTracefileWithoutEventException; /** * JniTrace @@ -229,7 +229,7 @@ public abstract class JniTrace extends Jni_C_Common { * * @exception JniException * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id */ public JniTrace(Jni_C_Pointer_And_Library_Id newPtr, boolean newPrintDebug) throws JniException { thisTracePtr = newPtr; @@ -612,7 +612,7 @@ public abstract class JniTrace extends Jni_C_Common { * * @param seekTime The time where we want to seek to * - * @see org.eclipse.linuxtools.lttng.jni.common.JniTime + * @see org.eclipse.linuxtools.internal.lttng.jni.common.JniTime */ public void seekToTime(JniTime seekTime) { @@ -643,7 +643,7 @@ public abstract class JniTrace extends Jni_C_Common { * @param seekTime The time where we want to seek to * * @see org.eclipse.linuxtools.lttng.jni.JniTracefile - * @see org.eclipse.linuxtools.lttng.jni.common.JniTime + * @see org.eclipse.linuxtools.internal.lttng.jni.common.JniTime */ public void seekToTime(JniTime seekTime, JniTracefile targetTracefile) { // Invalidate the current read event @@ -674,7 +674,7 @@ public abstract class JniTrace extends Jni_C_Common { * @return The event just after the seeked time or null if none available. * * @see org.eclipse.linuxtools.lttng.jni.JniEvent - * @see org.eclipse.linuxtools.lttng.jni.common.JniTime + * @see org.eclipse.linuxtools.internal.lttng.jni.common.JniTime */ public JniEvent seekAndRead(JniTime seekTime) { JniEvent returnedEvent = null; @@ -703,7 +703,7 @@ public abstract class JniTrace extends Jni_C_Common { * @return The event just after the seeked time or null if none available. * * @see org.eclipse.linuxtools.lttng.jni.JniTracefile - * @see org.eclipse.linuxtools.lttng.jni.common.JniTime + * @see org.eclipse.linuxtools.internal.lttng.jni.common.JniTime * @see org.eclipse.linuxtools.lttng.jni.JniEvent */ public JniEvent seekAndRead(JniTime seekTime, JniTracefile targetTracefile) { @@ -837,7 +837,7 @@ public abstract class JniTrace extends Jni_C_Common { * * @return Time of the last event read * - * @see org.eclipse.linuxtools.lttng.jni.common.JniTime + * @see org.eclipse.linuxtools.internal.lttng.jni.common.JniTime */ public JniTime getCurrentEventTimestamp() { JniTime returnedTime = null; @@ -861,7 +861,7 @@ public abstract class JniTrace extends Jni_C_Common { * * @return The actual (long converted) pointer or NULL. * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id */ public Jni_C_Pointer_And_Library_Id getTracePtr() { return thisTracePtr; @@ -992,7 +992,7 @@ public abstract class JniTrace extends Jni_C_Common { * @throws JniException The construction (allocation) failed. * * @see org.eclipse.linuxtools.lttng.jni.JniTracefile - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id * @see org.eclipse.linuxtools.lttng.jni.JniTrace */ public abstract JniTracefile allocateNewJniTracefile(Jni_C_Pointer_And_Library_Id newPtr, JniTrace newParentTrace) throws JniException; diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java index 383b4e38e5..e1545c747f 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java @@ -14,13 +14,13 @@ package org.eclipse.linuxtools.lttng.jni; import java.util.HashMap; -import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; -import org.eclipse.linuxtools.lttng.jni.exception.JniNoSuchEventException; -import org.eclipse.linuxtools.lttng.jni.exception.JniTracefileException; -import org.eclipse.linuxtools.lttng.jni.exception.JniTracefileWithoutEventException; +import org.eclipse.linuxtools.internal.lttng.jni.common.JniTime; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniNoSuchEventException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniTracefileException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniTracefileWithoutEventException; /** * JniTracefile @@ -172,7 +172,7 @@ public abstract class JniTracefile extends Jni_C_Common * @exception JniException * * @see org.eclipse.linuxtools.lttng.jni.JniTrace - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id */ public JniTracefile(Jni_C_Pointer_And_Library_Id newPtr, JniTrace newParentTrace) throws JniException { thisTracefilePtr = newPtr; @@ -195,7 +195,7 @@ public abstract class JniTracefile extends Jni_C_Common * * @return LTT read status, as defined in Jni_C_Constant * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Constant */ public int readNextEvent() { return currentEvent.readNextEvent(); @@ -210,7 +210,7 @@ public abstract class JniTracefile extends Jni_C_Common * * @return LTT read status, as defined in Jni_C_Constant * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Constant */ public int seekToTime(JniTime seekTime) { return currentEvent.seekToTime(seekTime); @@ -404,7 +404,7 @@ public abstract class JniTracefile extends Jni_C_Common * * @return The actual (long converted) pointer or NULL. * - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id */ public Jni_C_Pointer_And_Library_Id getTracefilePtr() { return thisTracefilePtr; @@ -485,7 +485,7 @@ public abstract class JniTracefile extends Jni_C_Common * @throws JniException The construction (allocation) failed. * * @see org.eclipse.linuxtools.lttng.jni.JniEvent - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id * @see org.eclipse.linuxtools.lttng.jni.JniMarker * @see org.eclipse.linuxtools.lttng.jni.JniTracefile */ @@ -507,7 +507,7 @@ public abstract class JniTracefile extends Jni_C_Common * @throws JniException The construction (allocation) failed. * * @see org.eclipse.linuxtools.lttng.jni.JniMarker - * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer_And_Library_Id + * @see org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Pointer_And_Library_Id */ public abstract JniMarker allocateNewJniMarker(Jni_C_Pointer_And_Library_Id newMarkerPtr) throws JniException; diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/Jni_C_Common.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/Jni_C_Common.java index d9895e4cf0..901293da86 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/Jni_C_Common.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/Jni_C_Common.java @@ -1,6 +1,6 @@ package org.eclipse.linuxtools.lttng.jni; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant; +import org.eclipse.linuxtools.internal.lttng.jni.common.Jni_C_Constant; /******************************************************************************* * Copyright (c) 2009 Ericsson diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java index ce29a75b6b..6bbe622b64 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java @@ -12,12 +12,12 @@ package org.eclipse.linuxtools.lttng.jni.factory; * Yufen Kuo (ykuo@mvista.com) - add support to allow user specify trace library path *******************************************************************************/ +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniTraceVersionException; +import org.eclipse.linuxtools.internal.lttng.jni_v2_3.JniTrace_v2_3; +import org.eclipse.linuxtools.internal.lttng.jni_v2_5.JniTrace_v2_5; +import org.eclipse.linuxtools.internal.lttng.jni_v2_6.JniTrace_v2_6; import org.eclipse.linuxtools.lttng.jni.JniTrace; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; -import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException; -import org.eclipse.linuxtools.lttng.jni_v2_3.JniTrace_v2_3; -import org.eclipse.linuxtools.lttng.jni_v2_5.JniTrace_v2_5; -import org.eclipse.linuxtools.lttng.jni_v2_6.JniTrace_v2_6; /** * JniTraceFactory diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java index c492c18783..6b9f7bc327 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java @@ -14,8 +14,8 @@ package org.eclipse.linuxtools.lttng.jni.factory; import java.io.File; -import org.eclipse.linuxtools.lttng.jni.exception.JniException; -import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniException; +import org.eclipse.linuxtools.internal.lttng.jni.exception.JniTraceVersionException; /** * JniTraceVersion -- 2.34.1