diff --git a/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/Eszkozok/Orientacio.java b/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/Eszkozok/Orientacio.java index 77a2d1dd80166386998dd7318fa949a8e9d76a90..dbd71cf49e5e73e4fd7da651ae24083fe65f064d 100644 --- a/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/Eszkozok/Orientacio.java +++ b/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/Eszkozok/Orientacio.java @@ -5,8 +5,10 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; +import android.util.Log; import com.feverkill.gatsj.aircursorandroid.Eszkozok.geometry.Vector3D; +import com.feverkill.gatsj.aircursorandroid.activities.MainActivity; public class Orientacio { @@ -15,47 +17,86 @@ public class Orientacio Sensor accelerometer; Sensor magnetometer; - float azimuth; - float pitch; - float roll; + private float azimuth; + private float pitch; + private float roll; + + private float azimuthOffset = 0; + private float pitchOffset = 0; + private float rollOffset = 0; + + + public Vector3D getAtlagoltUnitDirectionVector(int mintak) + { + Vector3D buff = Vector3D.Origin; + for (int i = 0; i < mintak; ++i) + { + buff = buff.plus(getUnitDirectionVector()); + try + { + Thread.sleep(3); + } + catch (InterruptedException e) + { + e.printStackTrace(); + } + } + return buff.getUnitVect(); + } public Vector3D getUnitDirectionVector() { - return new Vector3D(Math.cos(azimuth), -Math.sin(pitch), -Math.sin(azimuth)).getUnitVect(); + double y = Math.sin(getPitchRad()); + double lv = Math.cos(getPitchRad()); + + double x = Math.cos(getAzimuthRad()) * lv; + double z = Math.sin(getAzimuthRad()) * lv; + return new Vector3D(-x, -y, z).getUnitVect(); + } + + /** + * x:0, y:0, z:1 + */ + public void SetBase() + { + pitchOffset = -pitch; + azimuthOffset = -azimuth + (float) Math.toRadians(90); + rollOffset = -roll; } public String getAngleString() { - return "a: " + String.format("%.1f",getAzimuth()) + " p: " + String.format("%.1f",getPitch()) + " r: " + String.format("%.1f",getRoll()); + return "a: " + String.format("%.1f", getAzimuthDeg()) + " p: " + String.format("%.1f", getPitchDeg()) + " r: " + String.format("%.1f", getRollDeg()); } - public float getAzimuth() + public float getAzimuthDeg() { - return azimuth * 57.2957795f; + return getAzimuthRad() * 57.2957795f; } - public float getPitch() + public float getPitchDeg() { - return pitch * 57.2957795f; + return getPitchRad() * 57.2957795f; } - public float getRoll() + public float getRollDeg() { - return roll * 57.2957795f; + return getRollRad() * 57.2957795f; } + public float getAzimuthRad() { - return azimuth; + return azimuth + azimuthOffset; } public float getPitchRad() { - return pitch; + return pitch + pitchOffset; } public float getRollRad() { - return roll; + return roll + rollOffset; } public Orientacio(Context context) @@ -65,6 +106,8 @@ public class Orientacio manager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE); accelerometer = manager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); magnetometer = manager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + Sensor defaultGyroscope = manager.getDefaultSensor(Sensor.TYPE_GYROSCOPE); + Log.d("GYRO", String.valueOf(defaultGyroscope)); manager.registerListener(listener, accelerometer, SensorManager.SENSOR_DELAY_NORMAL); manager.registerListener(listener, magnetometer, SensorManager.SENSOR_DELAY_NORMAL); } @@ -93,7 +136,7 @@ public class Orientacio { SensorManager.getOrientation(R, orientation); azimuth = orientation[0]; - pitch =orientation[1]; + pitch = orientation[1]; roll = orientation[2]; } } diff --git a/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/activities/MainActivity.java b/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/activities/MainActivity.java index b149a4b6605056ce954f6db1f7ad0067e82e7096..aea63f201d857da5a0a18cc82de9648334fae769 100644 --- a/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/activities/MainActivity.java +++ b/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/activities/MainActivity.java @@ -36,6 +36,7 @@ public class MainActivity extends AppCompatActivity TextView textViewJA; TextView textViewJF; + Button btnSetOriBase; Button btnSettings; Button btnConnect; Button btnSend; @@ -64,6 +65,7 @@ public class MainActivity extends AppCompatActivity textViewJA = findViewById(R.id.textViewJA); textViewJF = findViewById(R.id.textViewJF); + btnSetOriBase = findViewById(R.id.btnSetOriBase); btnSettings = findViewById(R.id.btnSettings); btnConnect = findViewById(R.id.btnConnect); btnSend = findViewById(R.id.btnSend); @@ -75,6 +77,14 @@ public class MainActivity extends AppCompatActivity btnSetJF = findViewById(R.id.btnSetJF); + btnSetOriBase.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View view) + { + orientacio.SetBase(); + } + }); btnSettings.setOnClickListener(new View.OnClickListener() { @Override @@ -109,7 +119,7 @@ public class MainActivity extends AppCompatActivity { //textViewBA.setText(orientacio.getAngleString()); posMeroObject.UpdateVecBA(); - textViewBA.setText(orientacio.getUnitDirectionVector().toString()); + textViewBA.setText(orientacio.getAtlagoltUnitDirectionVector(10).toString()); } }); btnSetBF.setOnClickListener(new View.OnClickListener() @@ -119,7 +129,7 @@ public class MainActivity extends AppCompatActivity { //textViewBF.setText(orientacio.getAngleString()); posMeroObject.UpdateVecBF(); - textViewBF.setText(orientacio.getUnitDirectionVector().toString()); + textViewBF.setText(orientacio.getAtlagoltUnitDirectionVector(10).toString()); } }); btnSetJA.setOnClickListener(new View.OnClickListener() @@ -129,7 +139,7 @@ public class MainActivity extends AppCompatActivity { //textViewJA.setText(orientacio.getAngleString()); posMeroObject.UpdateVecJA(); - textViewJA.setText(orientacio.getUnitDirectionVector().toString()); + textViewJA.setText(orientacio.getAtlagoltUnitDirectionVector(10).toString()); } }); btnSetJF.setOnClickListener(new View.OnClickListener() @@ -139,17 +149,7 @@ public class MainActivity extends AppCompatActivity { //textViewJF.setText(orientacio.getAngleString()); posMeroObject.UpdateVecJF(); - textViewJF.setText(orientacio.getUnitDirectionVector().toString()); - } - }); - - - Button b = findViewById(R.id.button); - b.setOnClickListener(new View.OnClickListener() - { - public void onClick(View v) - { - Log.e("Orientacio", orientacio.getAngleString()); + textViewJF.setText(orientacio.getAtlagoltUnitDirectionVector(10).toString()); } }); diff --git a/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/szalak/PosMeroRunnable.java b/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/szalak/PosMeroRunnable.java index e2c006354b581346052f923894232eda6dbbb39d..23905e6bf633be8804e5b8221314557680aff0dc 100644 --- a/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/szalak/PosMeroRunnable.java +++ b/Android/app/src/main/java/com/feverkill/gatsj/aircursorandroid/szalak/PosMeroRunnable.java @@ -12,6 +12,8 @@ import com.feverkill.gatsj.aircursorandroid.activities.MainActivity; public class PosMeroRunnable implements Runnable { + final String LOGCIMKE = "PosMeroRunnable"; + boolean StopFlag = false; public void stop() @@ -23,7 +25,7 @@ public class PosMeroRunnable implements Runnable { while (!StopFlag) { - Vector3D aktvec = MainActivity.orientacio.getUnitDirectionVector(); + Vector3D aktvec = MainActivity.orientacio.getAtlagoltUnitDirectionVector(10); Line aktline = new Line(aktvec, Vector3D.Origin); @@ -61,13 +63,13 @@ public class PosMeroRunnable implements Runnable double ryBA = 1 - yBA / OldBABF.getLength();//rxBA: az y koordináta a képernyőn, 0-1 arányban, a BA sarok alapján - - MainActivity.Ma.BTEszk.SendSajatCommand(SajatCommandCreator.UjEgerCoords((float)rxBA, (float)ryBA)); + MainActivity.Ma.BTEszk.SendSajatCommand(SajatCommandCreator.UjEgerCoords((float) rxBA, (float) ryBA)); Log.d("rxBA", String.valueOf(rxBA)); } else UpdatePosGeometry(); + } @@ -75,22 +77,26 @@ public class PosMeroRunnable implements Runnable { if (UpdateVecBAFLAG) { - VecIranyBA = MainActivity.orientacio.getUnitDirectionVector(); + VecIranyBA = MainActivity.orientacio.getAtlagoltUnitDirectionVector(10); + Log.d(LOGCIMKE, "VecIranyBA Frissitve: " + VecIranyBA.toString()); UpdateVecBAFLAG = false; } if (UpdateVecBFFLAG) { - VecIranyBF = MainActivity.orientacio.getUnitDirectionVector(); + VecIranyBF = MainActivity.orientacio.getAtlagoltUnitDirectionVector(10); + Log.d(LOGCIMKE, "VecIranyBF Frissitve: " + VecIranyBF.toString()); UpdateVecBFFLAG = false; } if (UpdateVecJAFLAG) { - VecIranyJA = MainActivity.orientacio.getUnitDirectionVector(); + VecIranyJA = MainActivity.orientacio.getAtlagoltUnitDirectionVector(10); + Log.d(LOGCIMKE, "VecIranyJA Frissitve: " + VecIranyJA.toString()); UpdateVecJAFLAG = false; } if (UpdateVecJFFLAG) { - VecIranyJF = MainActivity.orientacio.getUnitDirectionVector(); + VecIranyJF = MainActivity.orientacio.getAtlagoltUnitDirectionVector(10); + Log.d(LOGCIMKE, "VecIranyJF Frissitve: " + VecIranyJF.toString()); UpdateVecJFFLAG = false; } @@ -103,6 +109,7 @@ public class PosMeroRunnable implements Runnable Vector3D VecIranyBA, VecIranyBF, VecIranyJA, VecIranyJF; + boolean AllVectorsAreSet()//Egyik vektor sem null { return VecIranyBA != null && VecIranyBF != null && VecIranyJA != null && VecIranyJF != null; @@ -125,6 +132,32 @@ public class PosMeroRunnable implements Runnable private void UpdatePosGeometry()//Ez illeszti a képernyőt az egyenesekre. Minden sarokjelölő változás után meg kell hívni { + if (true)//Debug illesztés + { + + Kepernyosik = new Plane(new Vector3D(0, 0, 1), new Vector3D(0, 0, 30)); + + SarokBA = new Vector3D(-10, -10, 30); + SarokBF = new Vector3D(-10, 10, 30); + SarokJA = new Vector3D(10, -10, 30); + SarokJF = new Vector3D(10, 10, 30); + + VecIranyBA = SarokBA.getUnitVect(); + VecIranyBF = SarokBF.getUnitVect(); + VecIranyJA = SarokJA.getUnitVect(); + VecIranyJF = SarokJF.getUnitVect(); + + OldBABF = SarokBF.minus(SarokBA); + OldBAJA = SarokJA.minus(SarokBA); + OldBFBA = SarokBA.minus(SarokBF); + OldBFJF = SarokJF.minus(SarokBF); + OldJABA = SarokBA.minus(SarokJA); + OldJAJF = SarokJF.minus(SarokJA); + OldJFBF = SarokBF.minus(SarokJF); + OldJFJA = SarokJA.minus(SarokJF); + + return; + } if (AllVectorsAreSet()) { Line lineBA = new Line(VecIranyBA, Vector3D.Origin); @@ -138,47 +171,11 @@ public class PosMeroRunnable implements Runnable Vector3D KepernyoKozeppont = vecKozep.copy().times(100); - double elsoszogugras = 10;//Fokban - - double[][] hibak = new double[(int) (180 / elsoszogugras + 2)][(int) (180 / elsoszogugras + 2)]; - EAngle[][] szogek = new EAngle[hibak.length][hibak[0].length]; - - - for (int y = 0; y < hibak.length; ++y) - for (int x = 0; x < hibak[0].length; ++x) - hibak[x][y] = Double.MAX_VALUE; - - int x = 0, y = 0; - for (double a = Math.toRadians(-88); a <= Math.toRadians(88); a += Math.toRadians(elsoszogugras)) - { - for (double p = Math.toRadians(-88); p <= Math.toRadians(88); p += Math.toRadians(elsoszogugras)) - { - - szogek[x][y] = new EAngle(alapszog.azimuth + a, alapszog.pitch + p); + EAngle legjobbszog = IllesztSik(alapszog, 5, 88, lineBA, lineBF, lineJA, lineJF, KepernyoKozeppont); + legjobbszog = IllesztSik(legjobbszog, 0.25, 5, lineBA, lineBF, lineJA, lineJF, KepernyoKozeppont); - Plane kepsik = new Plane(new Vector3D(szogek[x][y]), KepernyoKozeppont);//A képernyő síkja, aminek normálvektora az átlagol vector, és illeszkedik rá az átlagolt vektor végpontja - hibak[x][y] = GetKepsikHiba(kepsik, lineBA, lineBF, lineJA, lineJF); - ++x; - } - ++y; - x = 0; - } - - int bestx = 0, besty = 0; - double minhib = Double.MAX_VALUE; - for (y = 0; y < hibak.length; ++y) - for (x = 0; x < hibak[0].length; ++x) - { - if (hibak[x][y] < minhib) - { - minhib = hibak[x][y]; - bestx = x; - besty = y; - } - } - - Kepernyosik = new Plane(new Vector3D(szogek[bestx][besty]), KepernyoKozeppont); + Kepernyosik = new Plane(new Vector3D(legjobbszog), KepernyoKozeppont); SarokBA = Kepernyosik.GetIntersect(lineBA); SarokBF = Kepernyosik.GetIntersect(lineBF); SarokJA = Kepernyosik.GetIntersect(lineJA); @@ -193,17 +190,71 @@ public class PosMeroRunnable implements Runnable OldJFBF = SarokBF.minus(SarokJF); OldJFJA = SarokJA.minus(SarokJF); - for (y = 0; y < hibak.length; ++y) +// for (y = 0; y < hibak.length; ++y) +// { +// String s = ""; +// for (x = 0; x < hibak[0].length; ++x) +// s += String.format("%.3f", hibak[x][y]) + "\t"; +// +// Log.e("HIBAMAP", s); +// } + + + } + } + + /** + * @param alapszog + * @param szogugras + * @param szogtartvizsgal Az alapszöghöz képest ennyivel nézi + és - irányban az azimuth és pitch szerint a képsíkokat + * @param lineBA + * @param lineBF + * @param lineJA + * @param lineJF + * @param KepernyoKozeppont + * @return a legjobban illeszkedő szög + */ + private EAngle IllesztSik(EAngle alapszog, double szogugras, double szogtartvizsgal, Line lineBA, Line lineBF, Line lineJA, Line lineJF, Vector3D KepernyoKozeppont) + { + double[][] hibak = new double[(int) (180 / szogugras + 2)][(int) (180 / szogugras + 2)]; + EAngle[][] szogek = new EAngle[hibak.length][hibak[0].length]; + + + for (int y = 0; y < hibak.length; ++y) + for (int x = 0; x < hibak[0].length; ++x) + hibak[x][y] = Double.MAX_VALUE; + + int x = 0, y = 0; + for (double a = Math.toRadians(-szogtartvizsgal); a <= Math.toRadians(szogtartvizsgal); a += Math.toRadians(szogugras)) + { + for (double p = Math.toRadians(-szogtartvizsgal); p <= Math.toRadians(szogtartvizsgal); p += Math.toRadians(szogugras)) { - String s = ""; - for (x = 0; x < hibak[0].length; ++x) - s += String.format("%.3f", hibak[x][y]) + "\t"; - Log.e("HIBAMAP", s); - } + szogek[x][y] = new EAngle(alapszog.azimuth + a, alapszog.pitch + p); + Plane kepsik = new Plane(new Vector3D(szogek[x][y]), KepernyoKozeppont);//A képernyő síkja, aminek normálvektora az átlagol vector, és illeszkedik rá az átlagolt vektor végpontja + hibak[x][y] = GetKepsikHiba(kepsik, lineBA, lineBF, lineJA, lineJF); + ++x; + } + ++y; + x = 0; } + + int bestx = 0, besty = 0; + double minhib = Double.MAX_VALUE; + for (y = 0; y < hibak.length; ++y) + for (x = 0; x < hibak[0].length; ++x) + { + if (hibak[x][y] < minhib) + { + minhib = hibak[x][y]; + bestx = x; + besty = y; + } + } + + return szogek[bestx][besty]; } /** diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml index 89fc420d8594e52ea0da3178b956680697bbae09..56e5892a25ef9dfa8ddea14e2c986ec77572e91d 100644 --- a/Android/app/src/main/res/layout/activity_main.xml +++ b/Android/app/src/main/res/layout/activity_main.xml @@ -7,13 +7,13 @@ tools:context="com.feverkill.gatsj.aircursorandroid.activities.MainActivity"> <Button - android:id="@+id/button" + android:id="@+id/btnSetOriBase" android:layout_width="wrap_content" android:layout_height="49dp" android:layout_marginBottom="8dp" android:layout_marginEnd="8dp" android:layout_marginStart="8dp" - android:text="Button" + android:text="Set Ori Base" app:layout_constraintBottom_toTopOf="@+id/btnConnect" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/PC/.metadata/.log b/PC/.metadata/.log index d26ff7389ac719e66676ff94968fdac480f54660..a433063c9e624ca61516624238d16bd6c4e90662 100644 --- a/PC/.metadata/.log +++ b/PC/.metadata/.log @@ -1803,3 +1803,335 @@ java.lang.IllegalStateException: Registry Directory not available: c:\Program Fi !ENTRY org.eclipse.jface.text 2 0 2018-05-29 15:51:10.737 !MESSAGE Duplicate template id: 'org.eclipse.wst.xslt.templates.xpath.round' +!SESSION 2018-05-30 11:09:03.797 ----------------------------------------------- +eclipse.buildId=4.7.3.M20180330-0640 +java.version=1.8.0_172 +java.vendor=Oracle Corporation +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=hu_HU +Framework arguments: -product org.eclipse.epp.package.jee.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product + +!ENTRY org.eclipse.equinox.p2.reconciler.dropins 4 0 2018-05-30 11:09:05.465 +!MESSAGE FrameworkEvent ERROR +!STACK 0 +org.osgi.framework.BundleException: Exception in org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.start() of bundle org.eclipse.equinox.p2.reconciler.dropins. + at org.eclipse.osgi.internal.framework.BundleContextImpl.startActivator(BundleContextImpl.java:800) + at org.eclipse.osgi.internal.framework.BundleContextImpl.start(BundleContextImpl.java:729) + at org.eclipse.osgi.internal.framework.EquinoxBundle.startWorker0(EquinoxBundle.java:933) + at org.eclipse.osgi.internal.framework.EquinoxBundle$EquinoxModule.startWorker(EquinoxBundle.java:309) + at org.eclipse.osgi.container.Module.doStart(Module.java:581) + at org.eclipse.osgi.container.Module.start(Module.java:449) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1634) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1614) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1585) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1528) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1) + at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:230) + at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:340) +Caused by: java.lang.IllegalStateException: Registry Directory not available: c:\Program Files\Eclipse\eclipse\p2\org.eclipse.equinox.p2.engine\profileRegistry. + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:236) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:227) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.containsProfile(LazyProfileRegistry.java:208) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.containsProfile(ProfilePreferences.java:112) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.load(ProfilePreferences.java:259) + at org.eclipse.core.internal.preferences.EclipsePreferences.create(EclipsePreferences.java:370) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:623) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.RootPreferences.getNode(RootPreferences.java:105) + at org.eclipse.core.internal.preferences.RootPreferences.node(RootPreferences.java:84) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.getSharedPreferences(AbstractRepositoryManager.java:518) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.restoreRepositories(AbstractRepositoryManager.java:1016) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.basicGetRepository(AbstractRepositoryManager.java:181) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:649) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:96) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:92) + at org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener.initializeMetadataRepository(RepositoryListener.java:104) + at org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener.<init>(RepositoryListener.java:59) + at org.eclipse.equinox.internal.p2.reconciler.dropins.DropinsRepositoryListener.<init>(DropinsRepositoryListener.java:82) + at org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.watchDropins(Activator.java:540) + at org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.start(Activator.java:173) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:779) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:1) + at java.security.AccessController.doPrivileged(Native Method) + at org.eclipse.osgi.internal.framework.BundleContextImpl.startActivator(BundleContextImpl.java:772) + ... 12 more +Root exception: +java.lang.IllegalStateException: Registry Directory not available: c:\Program Files\Eclipse\eclipse\p2\org.eclipse.equinox.p2.engine\profileRegistry. + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:236) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:227) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.containsProfile(LazyProfileRegistry.java:208) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.containsProfile(ProfilePreferences.java:112) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.load(ProfilePreferences.java:259) + at org.eclipse.core.internal.preferences.EclipsePreferences.create(EclipsePreferences.java:370) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:623) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.RootPreferences.getNode(RootPreferences.java:105) + at org.eclipse.core.internal.preferences.RootPreferences.node(RootPreferences.java:84) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.getSharedPreferences(AbstractRepositoryManager.java:518) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.restoreRepositories(AbstractRepositoryManager.java:1016) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.basicGetRepository(AbstractRepositoryManager.java:181) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:649) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:96) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:92) + at org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener.initializeMetadataRepository(RepositoryListener.java:104) + at org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener.<init>(RepositoryListener.java:59) + at org.eclipse.equinox.internal.p2.reconciler.dropins.DropinsRepositoryListener.<init>(DropinsRepositoryListener.java:82) + at org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.watchDropins(Activator.java:540) + at org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.start(Activator.java:173) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:779) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:1) + at java.security.AccessController.doPrivileged(Native Method) + at org.eclipse.osgi.internal.framework.BundleContextImpl.startActivator(BundleContextImpl.java:772) + at org.eclipse.osgi.internal.framework.BundleContextImpl.start(BundleContextImpl.java:729) + at org.eclipse.osgi.internal.framework.EquinoxBundle.startWorker0(EquinoxBundle.java:933) + at org.eclipse.osgi.internal.framework.EquinoxBundle$EquinoxModule.startWorker(EquinoxBundle.java:309) + at org.eclipse.osgi.container.Module.doStart(Module.java:581) + at org.eclipse.osgi.container.Module.start(Module.java:449) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1634) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1614) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1585) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1528) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1) + at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:230) + at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:340) + +!ENTRY org.eclipse.jface 2 0 2018-05-30 11:09:11.374 +!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation. +!SUBENTRY 1 org.eclipse.jface 2 0 2018-05-30 11:09:11.374 +!MESSAGE A conflict occurred for ALT+CTRL+T: +Binding(ALT+CTRL+T, + ParameterizedCommand(Command(org.eclipse.search.ui.performTextSearchWorkspace,Find Text in Workspace, + Searches the files in the workspace for specific text., + Category(org.eclipse.search.ui.category.search,Search,Search command category,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@4dfe56dc, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,hu,,system) +Binding(ALT+CTRL+T, + ParameterizedCommand(Command(org.eclipse.tm.terminal.connector.local.command.launch,Open Local Terminal on Selection, + , + Category(org.eclipse.tm.terminal.view.ui.commands.category,Terminal Commands,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@2a728076, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) + +!ENTRY org.eclipse.egit.ui 2 0 2018-05-30 11:09:16.200 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\gatsj'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. + +!ENTRY org.eclipse.oomph.setup.ui 4 0 2018-05-30 11:09:19.155 +!MESSAGE Registry Directory not available: c:\Program Files\Eclipse\eclipse\p2\org.eclipse.equinox.p2.engine\profileRegistry. +!STACK 0 +java.lang.IllegalStateException: Registry Directory not available: c:\Program Files\Eclipse\eclipse\p2\org.eclipse.equinox.p2.engine\profileRegistry. + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:236) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:227) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.containsProfile(LazyProfileRegistry.java:208) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.containsProfile(ProfilePreferences.java:112) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.load(ProfilePreferences.java:259) + at org.eclipse.core.internal.preferences.EclipsePreferences.create(EclipsePreferences.java:370) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:623) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.RootPreferences.getNode(RootPreferences.java:105) + at org.eclipse.core.internal.preferences.RootPreferences.node(RootPreferences.java:84) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.getSharedPreferences(AbstractRepositoryManager.java:518) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.restoreRepositories(AbstractRepositoryManager.java:1016) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.getKnownRepositories(AbstractRepositoryManager.java:480) + at org.eclipse.oomph.p2.internal.core.CachingRepositoryManager$Artifact.getKnownRepositories(CachingRepositoryManager.java:604) + at org.eclipse.oomph.p2.core.P2Util.getKnownRepositories(P2Util.java:82) + at org.eclipse.oomph.setup.p2.impl.P2TaskImpl.isNeeded(P2TaskImpl.java:604) + at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer.initNeededSetupTasks(SetupTaskPerformer.java:1809) + at org.eclipse.oomph.setup.ui.SetupUIPlugin.performStartup(SetupUIPlugin.java:680) + at org.eclipse.oomph.setup.ui.SetupUIPlugin.access$5(SetupUIPlugin.java:416) + at org.eclipse.oomph.setup.ui.SetupUIPlugin$1$1.run(SetupUIPlugin.java:253) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:56) +!SESSION 2018-05-30 13:37:35.482 ----------------------------------------------- +eclipse.buildId=4.7.3.M20180330-0640 +java.version=1.8.0_172 +java.vendor=Oracle Corporation +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=hu_HU +Framework arguments: -product org.eclipse.epp.package.jee.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product + +!ENTRY org.eclipse.equinox.p2.reconciler.dropins 4 0 2018-05-30 13:37:37.111 +!MESSAGE FrameworkEvent ERROR +!STACK 0 +org.osgi.framework.BundleException: Exception in org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.start() of bundle org.eclipse.equinox.p2.reconciler.dropins. + at org.eclipse.osgi.internal.framework.BundleContextImpl.startActivator(BundleContextImpl.java:800) + at org.eclipse.osgi.internal.framework.BundleContextImpl.start(BundleContextImpl.java:729) + at org.eclipse.osgi.internal.framework.EquinoxBundle.startWorker0(EquinoxBundle.java:933) + at org.eclipse.osgi.internal.framework.EquinoxBundle$EquinoxModule.startWorker(EquinoxBundle.java:309) + at org.eclipse.osgi.container.Module.doStart(Module.java:581) + at org.eclipse.osgi.container.Module.start(Module.java:449) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1634) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1614) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1585) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1528) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1) + at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:230) + at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:340) +Caused by: java.lang.IllegalStateException: Registry Directory not available: c:\Program Files\Eclipse\eclipse\p2\org.eclipse.equinox.p2.engine\profileRegistry. + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:236) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:227) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.containsProfile(LazyProfileRegistry.java:208) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.containsProfile(ProfilePreferences.java:112) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.load(ProfilePreferences.java:259) + at org.eclipse.core.internal.preferences.EclipsePreferences.create(EclipsePreferences.java:370) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:623) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.RootPreferences.getNode(RootPreferences.java:105) + at org.eclipse.core.internal.preferences.RootPreferences.node(RootPreferences.java:84) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.getSharedPreferences(AbstractRepositoryManager.java:518) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.restoreRepositories(AbstractRepositoryManager.java:1016) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.basicGetRepository(AbstractRepositoryManager.java:181) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:649) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:96) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:92) + at org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener.initializeMetadataRepository(RepositoryListener.java:104) + at org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener.<init>(RepositoryListener.java:59) + at org.eclipse.equinox.internal.p2.reconciler.dropins.DropinsRepositoryListener.<init>(DropinsRepositoryListener.java:82) + at org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.watchDropins(Activator.java:540) + at org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.start(Activator.java:173) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:779) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:1) + at java.security.AccessController.doPrivileged(Native Method) + at org.eclipse.osgi.internal.framework.BundleContextImpl.startActivator(BundleContextImpl.java:772) + ... 12 more +Root exception: +java.lang.IllegalStateException: Registry Directory not available: c:\Program Files\Eclipse\eclipse\p2\org.eclipse.equinox.p2.engine\profileRegistry. + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:236) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:227) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.containsProfile(LazyProfileRegistry.java:208) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.containsProfile(ProfilePreferences.java:112) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.load(ProfilePreferences.java:259) + at org.eclipse.core.internal.preferences.EclipsePreferences.create(EclipsePreferences.java:370) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:623) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.RootPreferences.getNode(RootPreferences.java:105) + at org.eclipse.core.internal.preferences.RootPreferences.node(RootPreferences.java:84) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.getSharedPreferences(AbstractRepositoryManager.java:518) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.restoreRepositories(AbstractRepositoryManager.java:1016) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.basicGetRepository(AbstractRepositoryManager.java:181) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:649) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:96) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:92) + at org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener.initializeMetadataRepository(RepositoryListener.java:104) + at org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener.<init>(RepositoryListener.java:59) + at org.eclipse.equinox.internal.p2.reconciler.dropins.DropinsRepositoryListener.<init>(DropinsRepositoryListener.java:82) + at org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.watchDropins(Activator.java:540) + at org.eclipse.equinox.internal.p2.reconciler.dropins.Activator.start(Activator.java:173) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:779) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:1) + at java.security.AccessController.doPrivileged(Native Method) + at org.eclipse.osgi.internal.framework.BundleContextImpl.startActivator(BundleContextImpl.java:772) + at org.eclipse.osgi.internal.framework.BundleContextImpl.start(BundleContextImpl.java:729) + at org.eclipse.osgi.internal.framework.EquinoxBundle.startWorker0(EquinoxBundle.java:933) + at org.eclipse.osgi.internal.framework.EquinoxBundle$EquinoxModule.startWorker(EquinoxBundle.java:309) + at org.eclipse.osgi.container.Module.doStart(Module.java:581) + at org.eclipse.osgi.container.Module.start(Module.java:449) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1634) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1614) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1585) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1528) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1) + at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:230) + at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:340) + +!ENTRY org.eclipse.jface 2 0 2018-05-30 13:37:44.803 +!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation. +!SUBENTRY 1 org.eclipse.jface 2 0 2018-05-30 13:37:44.803 +!MESSAGE A conflict occurred for ALT+CTRL+T: +Binding(ALT+CTRL+T, + ParameterizedCommand(Command(org.eclipse.search.ui.performTextSearchWorkspace,Find Text in Workspace, + Searches the files in the workspace for specific text., + Category(org.eclipse.search.ui.category.search,Search,Search command category,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@4dfe56dc, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,hu,,system) +Binding(ALT+CTRL+T, + ParameterizedCommand(Command(org.eclipse.tm.terminal.connector.local.command.launch,Open Local Terminal on Selection, + , + Category(org.eclipse.tm.terminal.view.ui.commands.category,Terminal Commands,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@2a728076, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) + +!ENTRY org.eclipse.egit.ui 2 0 2018-05-30 13:37:49.994 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\gatsj'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. + +!ENTRY org.eclipse.oomph.setup.ui 4 0 2018-05-30 13:37:53.543 +!MESSAGE Registry Directory not available: c:\Program Files\Eclipse\eclipse\p2\org.eclipse.equinox.p2.engine\profileRegistry. +!STACK 0 +java.lang.IllegalStateException: Registry Directory not available: c:\Program Files\Eclipse\eclipse\p2\org.eclipse.equinox.p2.engine\profileRegistry. + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:236) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.getProfileMap(LazyProfileRegistry.java:227) + at org.eclipse.oomph.p2.internal.core.LazyProfileRegistry.containsProfile(LazyProfileRegistry.java:208) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.containsProfile(ProfilePreferences.java:112) + at org.eclipse.equinox.internal.p2.engine.ProfilePreferences.load(ProfilePreferences.java:259) + at org.eclipse.core.internal.preferences.EclipsePreferences.create(EclipsePreferences.java:370) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:623) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:629) + at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:766) + at org.eclipse.core.internal.preferences.RootPreferences.getNode(RootPreferences.java:105) + at org.eclipse.core.internal.preferences.RootPreferences.node(RootPreferences.java:84) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.getSharedPreferences(AbstractRepositoryManager.java:518) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.restoreRepositories(AbstractRepositoryManager.java:1016) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.getKnownRepositories(AbstractRepositoryManager.java:480) + at org.eclipse.oomph.p2.internal.core.CachingRepositoryManager$Artifact.getKnownRepositories(CachingRepositoryManager.java:604) + at org.eclipse.oomph.p2.core.P2Util.getKnownRepositories(P2Util.java:82) + at org.eclipse.oomph.setup.p2.impl.P2TaskImpl.isNeeded(P2TaskImpl.java:604) + at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer.initNeededSetupTasks(SetupTaskPerformer.java:1809) + at org.eclipse.oomph.setup.ui.SetupUIPlugin.performStartup(SetupUIPlugin.java:680) + at org.eclipse.oomph.setup.ui.SetupUIPlugin.access$5(SetupUIPlugin.java:416) + at org.eclipse.oomph.setup.ui.SetupUIPlugin$1$1.run(SetupUIPlugin.java:253) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:56) + +!ENTRY org.eclipse.jface.text 2 0 2018-05-30 13:50:28.144 +!MESSAGE Duplicate template id: 'org.eclipse.wst.xslt.templates.xpath.number' + +!ENTRY org.eclipse.jface.text 2 0 2018-05-30 13:50:28.145 +!MESSAGE Duplicate template id: 'org.eclipse.wst.xslt.templates.xpath.round' diff --git a/PC/.metadata/.mylyn/.tasks.xml.zip b/PC/.metadata/.mylyn/.tasks.xml.zip index f8aa018c59ba3529d8f382a9fc41533c02b6e375..90c989bb449214a3f43164f6047464130005981d 100644 Binary files a/PC/.metadata/.mylyn/.tasks.xml.zip and b/PC/.metadata/.mylyn/.tasks.xml.zip differ diff --git a/PC/.metadata/.mylyn/tasks.xml.zip b/PC/.metadata/.mylyn/tasks.xml.zip index c31686838a1eb22566fd45eab61a363fccf5fb83..af7dcceaf46b3ab54d6fc5478654e637ddb90639 100644 Binary files a/PC/.metadata/.mylyn/tasks.xml.zip and b/PC/.metadata/.mylyn/tasks.xml.zip differ diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/2d/60ab73f1ff6300181734f3c611fc8389 b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/2d/60ab73f1ff6300181734f3c611fc8389 new file mode 100644 index 0000000000000000000000000000000000000000..e1fe592e0bb7d5b4deac4045ccca96929e25078f --- /dev/null +++ b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/2d/60ab73f1ff6300181734f3c611fc8389 @@ -0,0 +1,45 @@ +package fo; + +import javax.bluetooth.BluetoothStateException; +import javax.bluetooth.LocalDevice; + +import eszkozok.BTSPPServer; + +public class Main +{ + public static eszkozok.MouseCorrectRobot FoRobot; + + public static void main(String[] args) + { + System.out.println("Starting Air Cursor PC Server"); + + try + { + FoRobot = new eszkozok.MouseCorrectRobot(); + } + catch (Exception e) + { + e.printStackTrace(); + } + + while (true) + { + LocalDevice localDevice = null; + try + { + localDevice = LocalDevice.getLocalDevice(); + } + catch (BluetoothStateException e) + { + e.printStackTrace(); + } + + System.out.println("Address: " + localDevice.getBluetoothAddress()); + System.out.println("Name: " + localDevice.getFriendlyName()); + + BTSPPServer sampleSPPServer = new BTSPPServer(); + sampleSPPServer.startServer(); + } + + } +} diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/37/209989314363001812c2e6b7a6dfe17e b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/53/207311c7ff6300181734f3c611fc8389 similarity index 52% rename from PC/.metadata/.plugins/org.eclipse.core.resources/.history/37/209989314363001812c2e6b7a6dfe17e rename to PC/.metadata/.plugins/org.eclipse.core.resources/.history/53/207311c7ff6300181734f3c611fc8389 index 02ed252f60ee23e354dff3f998aaf738ced48ff2..ff9402871776b6b369dbb495e73dc8e112e50ba0 100644 --- a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/37/209989314363001812c2e6b7a6dfe17e +++ b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/53/207311c7ff6300181734f3c611fc8389 @@ -6,13 +6,54 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; import java.util.Base64; import javax.bluetooth.*; import javax.microedition.io.*; +import fo.Main; + public class BTSPPServer { + public static void UzenetKezel(byte[] be) + { + try + { + if (be.length < 2) + return; + + SCommandType command = SCommandType + .getEnum(ByteBuffer.wrap(be, 0, 2).order(ByteOrder.LITTLE_ENDIAN).getShort()); + + switch (command) + { + case Semmi: + break; + + case UjEgerCoords: + + if (be.length < 10) + return; + + float x = ByteBuffer.wrap(be, 2, 4).order(ByteOrder.LITTLE_ENDIAN).getFloat(); + float y = ByteBuffer.wrap(be, 6, 4).order(ByteOrder.LITTLE_ENDIAN).getFloat(); + Main.FoRobot.MoveMouseControlled(x, y); + + break; + + default: + break; + + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + //start server public void startServer() { @@ -30,9 +71,9 @@ public class BTSPPServer System.out.println("\nServer Started. Waiting for clients to connect..."); StreamConnection connection = streamConnNotifier.acceptAndOpen(); - RemoteDevice dev = RemoteDevice.getRemoteDevice(connection); - System.out.println("Remote device address: " + dev.getBluetoothAddress()); - System.out.println("Remote device name: " + dev.getFriendlyName(true)); + //RemoteDevice dev = RemoteDevice.getRemoteDevice(connection); + //System.out.println("Remote device address: " + dev.getBluetoothAddress()); + //System.out.println("Remote device name: " + dev.getFriendlyName(true)); //read string from spp client InputStream inStream = connection.openInputStream(); @@ -41,12 +82,28 @@ public class BTSPPServer System.out.println("Reading from input Stream:"); while (true) { - String lineRead = bReader.readLine(); - System.out.print(lineRead); - byte[] be = Base64.getDecoder().decode(lineRead); + try + { + String lineRead = bReader.readLine(); + byte[] be = Base64.getDecoder().decode(lineRead); - if (false) - break; + UzenetKezel(be); + + + System.out.print(lineRead); + System.out.print(" --> "); + for (int i = 0; i < be.length; ++i) + System.out.print(be[i] + " "); + System.out.println(); + + + if (false) + break; + } + catch (Exception e) + { + e.printStackTrace(); + } } //send response to spp client OutputStream outStream = connection.openOutputStream(); diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/6e/60ae64e9ff6300181734f3c611fc8389 b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/6e/60ae64e9ff6300181734f3c611fc8389 new file mode 100644 index 0000000000000000000000000000000000000000..717c31101461d4fd5ed66e05b0fa14372e0118b8 --- /dev/null +++ b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/6e/60ae64e9ff6300181734f3c611fc8389 @@ -0,0 +1,43 @@ +package fo; + +import javax.bluetooth.BluetoothStateException; +import javax.bluetooth.LocalDevice; + +import eszkozok.BTSPPServer; + +public class Main +{ + public static eszkozok.MouseCorrectRobot FoRobot; + + public static void main(String[] args) + { + System.out.println("Starting Air Cursor PC Server"); + + try + { + FoRobot = new eszkozok.MouseCorrectRobot(); + } + catch (Exception e) + { + e.printStackTrace(); + } + + LocalDevice localDevice = null; + try + { + localDevice = LocalDevice.getLocalDevice(); + } + catch (BluetoothStateException e) + { + e.printStackTrace(); + } + + System.out.println("Address: " + localDevice.getBluetoothAddress()); + System.out.println("Name: " + localDevice.getFriendlyName()); + + BTSPPServer sampleSPPServer = new BTSPPServer(); + sampleSPPServer.startServer(); + + + } +} diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/76/00127d3f4363001812c2e6b7a6dfe17e b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/87/007a99e9ff6300181734f3c611fc8389 similarity index 51% rename from PC/.metadata/.plugins/org.eclipse.core.resources/.history/76/00127d3f4363001812c2e6b7a6dfe17e rename to PC/.metadata/.plugins/org.eclipse.core.resources/.history/87/007a99e9ff6300181734f3c611fc8389 index 4f770e9009d042c21d529259c54b1859ff0b9006..cc26ee98cda13358c79467f6e9ca1d4345dd36c0 100644 --- a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/76/00127d3f4363001812c2e6b7a6dfe17e +++ b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/87/007a99e9ff6300181734f3c611fc8389 @@ -6,13 +6,54 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; import java.util.Base64; import javax.bluetooth.*; import javax.microedition.io.*; +import fo.Main; + public class BTSPPServer { + public static void UzenetKezel(byte[] be) + { + try + { + if (be.length < 2) + return; + + SCommandType command = SCommandType + .getEnum(ByteBuffer.wrap(be, 0, 2).order(ByteOrder.LITTLE_ENDIAN).getShort()); + + switch (command) + { + case Semmi: + break; + + case UjEgerCoords: + + if (be.length < 10) + return; + + float x = ByteBuffer.wrap(be, 2, 4).order(ByteOrder.LITTLE_ENDIAN).getFloat(); + float y = ByteBuffer.wrap(be, 6, 4).order(ByteOrder.LITTLE_ENDIAN).getFloat(); + Main.FoRobot.MoveMouseControlled(x, y); + + break; + + default: + break; + + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + //start server public void startServer() { @@ -30,9 +71,9 @@ public class BTSPPServer System.out.println("\nServer Started. Waiting for clients to connect..."); StreamConnection connection = streamConnNotifier.acceptAndOpen(); - RemoteDevice dev = RemoteDevice.getRemoteDevice(connection); - System.out.println("Remote device address: " + dev.getBluetoothAddress()); - System.out.println("Remote device name: " + dev.getFriendlyName(true)); + //RemoteDevice dev = RemoteDevice.getRemoteDevice(connection); + //System.out.println("Remote device address: " + dev.getBluetoothAddress()); + //System.out.println("Remote device name: " + dev.getFriendlyName(true)); //read string from spp client InputStream inStream = connection.openInputStream(); @@ -41,15 +82,30 @@ public class BTSPPServer System.out.println("Reading from input Stream:"); while (true) { - String lineRead = bReader.readLine(); - System.out.print(lineRead); - System.out.print(" --> "); - byte[] be = Base64.getDecoder().decode(lineRead); - - for(int i = 0; i < be.length; +i) - - if (false) - break; + try + { + String lineRead = bReader.readLine(); + if(lineRead == null) + break; + byte[] be = Base64.getDecoder().decode(lineRead); + + UzenetKezel(be); + + + System.out.print(lineRead); + System.out.print(" --> "); + for (int i = 0; i < be.length; ++i) + System.out.print(be[i] + " "); + System.out.println(); + + + if (false) + break; + } + catch (Exception e) + { + e.printStackTrace(); + } } //send response to spp client OutputStream outStream = connection.openOutputStream(); diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/6f/80ce7a3c4363001812c2e6b7a6dfe17e b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/c3/0074e3c8ff6300181734f3c611fc8389 similarity index 52% rename from PC/.metadata/.plugins/org.eclipse.core.resources/.history/6f/80ce7a3c4363001812c2e6b7a6dfe17e rename to PC/.metadata/.plugins/org.eclipse.core.resources/.history/c3/0074e3c8ff6300181734f3c611fc8389 index d1894a2e83826fc87f69d9273b03bf9cd80b6ab2..8b798434eb9628145cb7da208f7aced7c112b075 100644 --- a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/6f/80ce7a3c4363001812c2e6b7a6dfe17e +++ b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/c3/0074e3c8ff6300181734f3c611fc8389 @@ -6,13 +6,54 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; import java.util.Base64; import javax.bluetooth.*; import javax.microedition.io.*; +import fo.Main; + public class BTSPPServer { + public static void UzenetKezel(byte[] be) + { + try + { + if (be.length < 2) + return; + + SCommandType command = SCommandType + .getEnum(ByteBuffer.wrap(be, 0, 2).order(ByteOrder.LITTLE_ENDIAN).getShort()); + + switch (command) + { + case Semmi: + break; + + case UjEgerCoords: + + if (be.length < 10) + return; + + float x = ByteBuffer.wrap(be, 2, 4).order(ByteOrder.LITTLE_ENDIAN).getFloat(); + float y = ByteBuffer.wrap(be, 6, 4).order(ByteOrder.LITTLE_ENDIAN).getFloat(); + Main.FoRobot.MoveMouseControlled(x, y); + + break; + + default: + break; + + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + //start server public void startServer() { @@ -30,9 +71,9 @@ public class BTSPPServer System.out.println("\nServer Started. Waiting for clients to connect..."); StreamConnection connection = streamConnNotifier.acceptAndOpen(); - RemoteDevice dev = RemoteDevice.getRemoteDevice(connection); - System.out.println("Remote device address: " + dev.getBluetoothAddress()); - System.out.println("Remote device name: " + dev.getFriendlyName(true)); + //RemoteDevice dev = RemoteDevice.getRemoteDevice(connection); + //System.out.println("Remote device address: " + dev.getBluetoothAddress()); + //System.out.println("Remote device name: " + dev.getFriendlyName(true)); //read string from spp client InputStream inStream = connection.openInputStream(); @@ -41,13 +82,29 @@ public class BTSPPServer System.out.println("Reading from input Stream:"); while (true) { - String lineRead = bReader.readLine(); - System.out.print(lineRead); - System.out.print(" --> "); - byte[] be = Base64.getDecoder().decode(lineRead); + try + { + String lineRead = bReader.readLine(); + if(lineRead == null) + byte[] be = Base64.getDecoder().decode(lineRead); - if (false) - break; + UzenetKezel(be); + + + System.out.print(lineRead); + System.out.print(" --> "); + for (int i = 0; i < be.length; ++i) + System.out.print(be[i] + " "); + System.out.println(); + + + if (false) + break; + } + catch (Exception e) + { + e.printStackTrace(); + } } //send response to spp client OutputStream outStream = connection.openOutputStream(); diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/d/80902ef5ff6300181734f3c611fc8389 b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/d/80902ef5ff6300181734f3c611fc8389 new file mode 100644 index 0000000000000000000000000000000000000000..cec3ee4ecd9cf92088404b11400e6237814042f0 --- /dev/null +++ b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/d/80902ef5ff6300181734f3c611fc8389 @@ -0,0 +1,45 @@ +package fo; + +import javax.bluetooth.BluetoothStateException; +import javax.bluetooth.LocalDevice; + +import eszkozok.BTSPPServer; + +public class Main +{ + public static eszkozok.MouseCorrectRobot FoRobot; + + public static void main(String[] args) + { + System.out.println("Starting Air Cursor PC Server"); + + try + { + FoRobot = new eszkozok.MouseCorrectRobot(); + } + catch (Exception e) + { + e.printStackTrace(); + } + + while (true)//Debug mindig ujraindulo szerver, ha lecsatlakozik r�la a tel� + { + LocalDevice localDevice = null; + try + { + localDevice = LocalDevice.getLocalDevice(); + } + catch (BluetoothStateException e) + { + e.printStackTrace(); + } + + System.out.println("Address: " + localDevice.getBluetoothAddress()); + System.out.println("Name: " + localDevice.getFriendlyName()); + + BTSPPServer sampleSPPServer = new BTSPPServer(); + sampleSPPServer.startServer(); + } + + } +} diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/5b/40b2b9274363001812c2e6b7a6dfe17e b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/d4/70f4cfbeff6300181734f3c611fc8389 similarity index 52% rename from PC/.metadata/.plugins/org.eclipse.core.resources/.history/5b/40b2b9274363001812c2e6b7a6dfe17e rename to PC/.metadata/.plugins/org.eclipse.core.resources/.history/d4/70f4cfbeff6300181734f3c611fc8389 index b200ee635b60cc1527e9f34b10d48e43f4773a7a..ff9402871776b6b369dbb495e73dc8e112e50ba0 100644 --- a/PC/.metadata/.plugins/org.eclipse.core.resources/.history/5b/40b2b9274363001812c2e6b7a6dfe17e +++ b/PC/.metadata/.plugins/org.eclipse.core.resources/.history/d4/70f4cfbeff6300181734f3c611fc8389 @@ -6,13 +6,54 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; import java.util.Base64; import javax.bluetooth.*; import javax.microedition.io.*; +import fo.Main; + public class BTSPPServer { + public static void UzenetKezel(byte[] be) + { + try + { + if (be.length < 2) + return; + + SCommandType command = SCommandType + .getEnum(ByteBuffer.wrap(be, 0, 2).order(ByteOrder.LITTLE_ENDIAN).getShort()); + + switch (command) + { + case Semmi: + break; + + case UjEgerCoords: + + if (be.length < 10) + return; + + float x = ByteBuffer.wrap(be, 2, 4).order(ByteOrder.LITTLE_ENDIAN).getFloat(); + float y = ByteBuffer.wrap(be, 6, 4).order(ByteOrder.LITTLE_ENDIAN).getFloat(); + Main.FoRobot.MoveMouseControlled(x, y); + + break; + + default: + break; + + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + //start server public void startServer() { @@ -30,9 +71,9 @@ public class BTSPPServer System.out.println("\nServer Started. Waiting for clients to connect..."); StreamConnection connection = streamConnNotifier.acceptAndOpen(); - RemoteDevice dev = RemoteDevice.getRemoteDevice(connection); - System.out.println("Remote device address: " + dev.getBluetoothAddress()); - System.out.println("Remote device name: " + dev.getFriendlyName(true)); + //RemoteDevice dev = RemoteDevice.getRemoteDevice(connection); + //System.out.println("Remote device address: " + dev.getBluetoothAddress()); + //System.out.println("Remote device name: " + dev.getFriendlyName(true)); //read string from spp client InputStream inStream = connection.openInputStream(); @@ -41,12 +82,28 @@ public class BTSPPServer System.out.println("Reading from input Stream:"); while (true) { - String lineRead = bReader.readLine(); - System.out.println(); - byte[] be = Base64.getDecoder().decode(lineRead); + try + { + String lineRead = bReader.readLine(); + byte[] be = Base64.getDecoder().decode(lineRead); - if (false) - break; + UzenetKezel(be); + + + System.out.print(lineRead); + System.out.print(" --> "); + for (int i = 0; i < be.length; ++i) + System.out.print(be[i] + " "); + System.out.println(); + + + if (false) + break; + } + catch (Exception e) + { + e.printStackTrace(); + } } //send response to spp client OutputStream outStream = connection.openOutputStream(); diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.indexes/e4/1a/history.index b/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.indexes/e4/1a/history.index index 25778ff132aedb797c31137804eef9cfeaf4bdb0..60bea6abf135a832ee4b0b35b6abbe615cf73652 100644 Binary files a/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.indexes/e4/1a/history.index and b/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.indexes/e4/1a/history.index differ diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.indexes/e4/c9/history.index b/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.indexes/e4/c9/history.index index 48520c011994cc612258b3f81cd13bf39fb39cc8..4c0cec13a9b31bfc6f06aee8684c1a87c15cede6 100644 Binary files a/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.indexes/e4/c9/history.index and b/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.indexes/e4/c9/history.index differ diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.markers b/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.markers index 76f2f672d35897882e49eaf337e165889133cb15..95d47c27982fc3c07469b79409b642ef95e009b0 100644 Binary files a/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.markers and b/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/.markers differ diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/org.eclipse.jdt.core/state.dat b/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/org.eclipse.jdt.core/state.dat index f283c43c883f76e4d278fc36d08c68be78b38d6b..1b75bbecb73126b2772974e8cbaa193273676179 100644 Binary files a/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/org.eclipse.jdt.core/state.dat and b/PC/.metadata/.plugins/org.eclipse.core.resources/.projects/AirCursorPCServer/org.eclipse.jdt.core/state.dat differ diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.root/8.tree b/PC/.metadata/.plugins/org.eclipse.core.resources/.root/10.tree similarity index 56% rename from PC/.metadata/.plugins/org.eclipse.core.resources/.root/8.tree rename to PC/.metadata/.plugins/org.eclipse.core.resources/.root/10.tree index b1c7f2a9d80ad62575ba11eb94db1ac82faf176e..ab4895c11c41db1f2858e983547d9e359d4c86e5 100644 Binary files a/PC/.metadata/.plugins/org.eclipse.core.resources/.root/8.tree and b/PC/.metadata/.plugins/org.eclipse.core.resources/.root/10.tree differ diff --git a/PC/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/PC/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index f7d7ba58c1f956bf1b71835873fbf6215a832aa0..ab4e42e50aeef43aadbd206c51528af985b5f6b0 100644 Binary files a/PC/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/PC/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/PC/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/PC/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index d6a73f7b63651ed13f42d7b21cc302b37b4be375..82e5a5469e4b2c00b40668377b752be47218609f 100644 --- a/PC/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/PC/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="ASCII"?> <application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_aLHq4V2-EeiwQNQmo1Li3A" elementId="org.eclipse.e4.legacy.ide.application" contributorURI="platform:/plugin/org.eclipse.platform" selectedElement="_aLHq4l2-EeiwQNQmo1Li3A" bindingContexts="_aLHq5F2-EeiwQNQmo1Li3A"> - <persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<workbench>
<mruList>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="MouseCorrectRobot.java" tooltip="AirCursorPCServer/src/eszkozok/MouseCorrectRobot.java">
<persistable path="/AirCursorPCServer/src/eszkozok/MouseCorrectRobot.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="BTSPPServer.java" tooltip="AirCursorPCServer/src/eszkozok/BTSPPServer.java">
<persistable path="/AirCursorPCServer/src/eszkozok/BTSPPServer.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="SCommandType.java" tooltip="AirCursorPCServer/src/eszkozok/SCommandType.java">
<persistable path="/AirCursorPCServer/src/eszkozok/SCommandType.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="Main.java" tooltip="AirCursorPCServer/src/fo/Main.java">
<persistable path="/AirCursorPCServer/src/fo/Main.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="BTSPPServer.java" tooltip="AirCursorPCServer/src/Eszkozok/BTSPPServer.java">
<persistable path="/AirCursorPCServer/src/Eszkozok/BTSPPServer.java"/>
</file>
<file factoryID="org.eclipse.jdt.ui.ClassFileEditorInputFactory" id="org.eclipse.jdt.ui.ClassFileEditorNoSource" name="PrintStream.class" tooltip="java.io.PrintStream">
<persistable org.eclipse.jdt.ui.ClassFileIdentifier="=AirCursorPCServer/C:\/Program Files\/Java\/jre1.8.0_172\/lib\/rt.jar&lt;java.io(PrintStream.class"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="SajatRobot.java" tooltip="AirCursorPCServer/src/Eszkozok/SajatRobot.java">
<persistable path="/AirCursorPCServer/src/Eszkozok/SajatRobot.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="Main.java" tooltip="AirCursorPCServer/src/main/Main.java">
<persistable path="/AirCursorPCServer/src/main/Main.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="Main.java" tooltip="AirCursorPCServer/src/Main.java">
<persistable path="/AirCursorPCServer/src/Main.java"/>
</file>
</mruList>
</workbench>"/> + <persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<workbench>
<mruList>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="BTSPPServer.java" tooltip="AirCursorPCServer/src/eszkozok/BTSPPServer.java">
<persistable path="/AirCursorPCServer/src/eszkozok/BTSPPServer.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="MouseCorrectRobot.java" tooltip="AirCursorPCServer/src/eszkozok/MouseCorrectRobot.java">
<persistable path="/AirCursorPCServer/src/eszkozok/MouseCorrectRobot.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="SCommandType.java" tooltip="AirCursorPCServer/src/eszkozok/SCommandType.java">
<persistable path="/AirCursorPCServer/src/eszkozok/SCommandType.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="Main.java" tooltip="AirCursorPCServer/src/fo/Main.java">
<persistable path="/AirCursorPCServer/src/fo/Main.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="BTSPPServer.java" tooltip="AirCursorPCServer/src/Eszkozok/BTSPPServer.java">
<persistable path="/AirCursorPCServer/src/Eszkozok/BTSPPServer.java"/>
</file>
<file factoryID="org.eclipse.jdt.ui.ClassFileEditorInputFactory" id="org.eclipse.jdt.ui.ClassFileEditorNoSource" name="PrintStream.class" tooltip="java.io.PrintStream">
<persistable org.eclipse.jdt.ui.ClassFileIdentifier="=AirCursorPCServer/C:\/Program Files\/Java\/jre1.8.0_172\/lib\/rt.jar&lt;java.io(PrintStream.class"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="SajatRobot.java" tooltip="AirCursorPCServer/src/Eszkozok/SajatRobot.java">
<persistable path="/AirCursorPCServer/src/Eszkozok/SajatRobot.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="Main.java" tooltip="AirCursorPCServer/src/main/Main.java">
<persistable path="/AirCursorPCServer/src/main/Main.java"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.jdt.ui.CompilationUnitEditor" name="Main.java" tooltip="AirCursorPCServer/src/Main.java">
<persistable path="/AirCursorPCServer/src/Main.java"/>
</file>
</mruList>
</workbench>"/> <tags>ModelMigrationProcessor.001</tags> <tags>activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration</tags> - <children xsi:type="basic:TrimmedWindow" xmi:id="_aLHq4l2-EeiwQNQmo1Li3A" elementId="IDEWindow" contributorURI="platform:/plugin/org.eclipse.platform" selectedElement="_aj1s4V2-EeiwQNQmo1Li3A" label="%trimmedwindow.label.eclipseSDK" x="857" y="-8" width="1024" height="768"> + <children xsi:type="basic:TrimmedWindow" xmi:id="_aLHq4l2-EeiwQNQmo1Li3A" elementId="IDEWindow" contributorURI="platform:/plugin/org.eclipse.platform" selectedElement="_aj1s4V2-EeiwQNQmo1Li3A" label="%trimmedwindow.label.eclipseSDK" x="0" y="0" width="1024" height="768"> <persistedState key="coolBarVisible" value="true"/> <persistedState key="perspectiveBarVisible" value="true"/> <persistedState key="isRestored" value="true"/> @@ -189,7 +189,7 @@ </children> </children> <children xsi:type="basic:PartSashContainer" xmi:id="_-QTwbV2-EeiJcJeni346Cg" containerData="8665" selectedElement="_-QTwd12-EeiJcJeni346Cg"> - <children xsi:type="basic:PartSashContainer" xmi:id="_-QTwbl2-EeiJcJeni346Cg" containerData="5261" selectedElement="_-QTwb12-EeiJcJeni346Cg" horizontal="true"> + <children xsi:type="basic:PartSashContainer" xmi:id="_-QTwbl2-EeiJcJeni346Cg" containerData="7561" selectedElement="_-QTwb12-EeiJcJeni346Cg" horizontal="true"> <children xsi:type="advanced:Placeholder" xmi:id="_-QTwb12-EeiJcJeni346Cg" elementId="org.eclipse.ui.editorss" containerData="7500" ref="_ayhpIF2-EeiwQNQmo1Li3A"/> <children xsi:type="basic:PartSashContainer" xmi:id="_-QTwcF2-EeiJcJeni346Cg" containerData="2500" selectedElement="_-QTwcV2-EeiJcJeni346Cg"> <children xsi:type="basic:PartStack" xmi:id="_-QTwcV2-EeiJcJeni346Cg" elementId="org.eclipse.mylyn.tasks.ui.views.tasksMStack" containerData="5000" selectedElement="_-QTwcl2-EeiJcJeni346Cg"> @@ -203,7 +203,7 @@ </children> </children> </children> - <children xsi:type="basic:PartStack" xmi:id="_-QTwd12-EeiJcJeni346Cg" elementId="bottom" containerData="4739" selectedElement="_-QTwfF2-EeiJcJeni346Cg"> + <children xsi:type="basic:PartStack" xmi:id="_-QTwd12-EeiJcJeni346Cg" elementId="bottom" containerData="2439" selectedElement="_-QTwfF2-EeiJcJeni346Cg"> <tags>org.eclipse.e4.secondaryDataStack</tags> <tags>Java</tags> <tags>Debug</tags> @@ -345,23 +345,23 @@ <tags>categoryTag:Help</tags> </sharedElements> <sharedElements xsi:type="advanced:Area" xmi:id="_ayhpIF2-EeiwQNQmo1Li3A" elementId="org.eclipse.ui.editorss" selectedElement="_ayhpIV2-EeiwQNQmo1Li3A"> - <children xsi:type="basic:PartStack" xmi:id="_ayhpIV2-EeiwQNQmo1Li3A" elementId="org.eclipse.e4.primaryDataStack" selectedElement="_WETFkGNHEeidIdhNuvomDQ"> + <children xsi:type="basic:PartStack" xmi:id="_ayhpIV2-EeiwQNQmo1Li3A" elementId="org.eclipse.e4.primaryDataStack" selectedElement="_Km9kAF2_EeiJcJeni346Cg"> <tags>org.eclipse.e4.primaryDataStack</tags> <tags>EditorStack</tags> <children xsi:type="basic:Part" xmi:id="_Km9kAF2_EeiJcJeni346Cg" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="Main.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true"> - <persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor" name="Main.java" partName="Main.java" title="Main.java" tooltip="AirCursorPCServer/src/fo/Main.java">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/AirCursorPCServer/src/fo/Main.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="287" selectionTopPixel="0"/>
</editor>"/> + <persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor" name="Main.java" partName="Main.java" title="Main.java" tooltip="AirCursorPCServer/src/fo/Main.java">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/AirCursorPCServer/src/fo/Main.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="544" selectionTopPixel="0"/>
</editor>"/> <tags>Editor</tags> <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags> <tags>removeOnHide</tags> </children> <children xsi:type="basic:Part" xmi:id="_x6iswGLQEeifiaWhg1jCmQ" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="BTSPPServer.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true"> - <persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor" name="BTSPPServer.java" partName="BTSPPServer.java" title="BTSPPServer.java" tooltip="AirCursorPCServer/src/eszkozok/BTSPPServer.java">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/AirCursorPCServer/src/eszkozok/BTSPPServer.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="2359" selectionTopPixel="1107"/>
</editor>"/> + <persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor" name="BTSPPServer.java" partName="BTSPPServer.java" title="BTSPPServer.java" tooltip="AirCursorPCServer/src/eszkozok/BTSPPServer.java">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/AirCursorPCServer/src/eszkozok/BTSPPServer.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="3005" selectionTopPixel="1176"/>
</editor>"/> <tags>Editor</tags> <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags> <tags>removeOnHide</tags> </children> <children xsi:type="basic:Part" xmi:id="_WETFkGNHEeidIdhNuvomDQ" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="SCommandType.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true"> - <persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor" name="SCommandType.java" partName="SCommandType.java" title="SCommandType.java" tooltip="AirCursorPCServer/src/eszkozok/SCommandType.java">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/AirCursorPCServer/src/eszkozok/SCommandType.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="149" selectionTopPixel="0"/>
</editor>"/> + <persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor" name="SCommandType.java" partName="SCommandType.java" title="SCommandType.java" tooltip="AirCursorPCServer/src/eszkozok/SCommandType.java">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/AirCursorPCServer/src/eszkozok/SCommandType.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="238" selectionTopPixel="0"/>
</editor>"/> <tags>Editor</tags> <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags> <tags>removeOnHide</tags> @@ -674,7 +674,7 @@ </children> <children xsi:type="menu:ToolBar" xmi:id="_aowCEF2-EeiwQNQmo1Li3A" elementId="org.eclipse.ui.workbench.file"> <tags>Draggable</tags> - <children xsi:type="menu:HandledToolItem" xmi:id="_s_gzMGM-EeidIdhNuvomDQ" elementId="print" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.png" tooltip="Print" command="_aL01x12-EeiwQNQmo1Li3A"/> + <children xsi:type="menu:HandledToolItem" xmi:id="_3siv0GP9EeisLtK2x0bn0g" elementId="print" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.png" tooltip="Print" command="_aL01x12-EeiwQNQmo1Li3A"/> </children> <children xsi:type="menu:ToolBar" xmi:id="_aowpIF2-EeiwQNQmo1Li3A" elementId="additions" toBeRendered="false"> <tags>toolbarSeparator</tags> @@ -707,7 +707,7 @@ </children> <children xsi:type="menu:ToolBar" xmi:id="_aowpJF2-EeiwQNQmo1Li3A" elementId="org.eclipse.ui.workbench.navigate"> <tags>Draggable</tags> - <children xsi:type="menu:HandledToolItem" xmi:id="_s_jPcGM-EeidIdhNuvomDQ" elementId="org.eclipse.ui.window.pinEditor" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.png" tooltip="Pin Editor" type="Check" command="_aL0Oq12-EeiwQNQmo1Li3A"/> + <children xsi:type="menu:HandledToolItem" xmi:id="_3slzIGP9EeisLtK2x0bn0g" elementId="org.eclipse.ui.window.pinEditor" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.png" tooltip="Pin Editor" type="Check" command="_aL0Oq12-EeiwQNQmo1Li3A"/> </children> <children xsi:type="menu:ToolBar" xmi:id="_aowpJV2-EeiwQNQmo1Li3A" elementId="group.editor" toBeRendered="false"> <tags>toolbarSeparator</tags> @@ -3391,7 +3391,7 @@ <addons xmi:id="_aLIR9F2-EeiwQNQmo1Li3A" elementId="MinMax Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon"/> <addons xmi:id="_aLIR9V2-EeiwQNQmo1Li3A" elementId="org.eclipse.ui.workbench.addon.0" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/> <addons xmi:id="_aLO_oF2-EeiwQNQmo1Li3A" elementId="SplitterAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.splitteraddon.SplitterAddon"/> - <addons xmi:id="_sje-gWM-EeidIdhNuvomDQ" elementId="org.eclipse.ui.ide.addon.0" contributionURI="bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon"/> + <addons xmi:id="_3R5bMWP9EeisLtK2x0bn0g" elementId="org.eclipse.ui.ide.addon.0" contributionURI="bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon"/> <addons xmi:id="_dz0JgGOlEeSMMaPQU2nlzw" elementId="org.eclipse.ui.ide.application.addon.0" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.ui.ide.application/org.eclipse.ui.internal.ide.application.addons.ModelCleanupAddon"/> <categories xmi:id="_aLrrkF2-EeiwQNQmo1Li3A" elementId="org.eclipse.ui.category.edit" name="Edit"/> <categories xmi:id="_aLrrkV2-EeiwQNQmo1Li3A" elementId="org.eclipse.wb.core.actions.category" name="WindowBuilder Pro" description="WindowBuilder Pro actions"/> diff --git a/PC/.metadata/.plugins/org.eclipse.jdt.core/2013377319.index b/PC/.metadata/.plugins/org.eclipse.jdt.core/2013377319.index index d9baa06deade24d58f04f5c6e62db3e246ce4d11..e1afc9caa5a571c79f24f325c9e2334c1b3c3872 100644 Binary files a/PC/.metadata/.plugins/org.eclipse.jdt.core/2013377319.index and b/PC/.metadata/.plugins/org.eclipse.jdt.core/2013377319.index differ diff --git a/PC/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/PC/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log index c4b9636e13f354a5e1d8a2452ee8ba090aacbe87..3dfed0b4a982c0702cb5f33e85833e2456b4b81f 100644 --- a/PC/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log +++ b/PC/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log @@ -7,3 +7,5 @@ 2018-05-29 01:41:18,487 [Worker-5] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is out-of-date. Trying to update. 2018-05-29 02:07:40,414 [Worker-4] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. 2018-05-29 14:49:23,624 [Worker-5] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. +2018-05-30 11:09:15,641 [Worker-6] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is out-of-date. Trying to update. +2018-05-30 13:37:49,403 [Worker-5] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. diff --git a/PC/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/PC/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties index 75274217f91db4d3d226a957743f1b8e659eb6b1..47253f56bb73b91eafdc812a00d602d032fe3a52 100644 --- a/PC/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties +++ b/PC/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties @@ -1,2 +1,2 @@ #Cached timestamps -#Wed May 30 03:13:58 CEST 2018 +#Wed May 30 22:38:40 CEST 2018 diff --git a/PC/.metadata/version.ini b/PC/.metadata/version.ini index 0a62f32a1860c994696e31e678bbbef19c37da50..c7b9ebe6415aa6d93ae6c3690e047ad6c057e8e3 100644 --- a/PC/.metadata/version.ini +++ b/PC/.metadata/version.ini @@ -1,3 +1,3 @@ -#Tue May 29 14:49:15 CEST 2018 +#Wed May 30 13:37:41 CEST 2018 org.eclipse.core.runtime=2 org.eclipse.platform=4.7.3.v20180330-0640 diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.fdt b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.fdt similarity index 100% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.fdt rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.fdt diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.fdx b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.fdx similarity index 100% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.fdx rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.fdx diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.fnm b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.fnm similarity index 100% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.fnm rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.fnm diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.frq b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.frq similarity index 100% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.frq rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.frq diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.nrm b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.nrm similarity index 100% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.nrm rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.nrm diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.prx b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.prx similarity index 100% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.prx rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.prx diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.tii b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.tii similarity index 100% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.tii rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.tii diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.tis b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.tis similarity index 100% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_2.tis rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/_3.tis diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments.gen b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments.gen index e9fa6008becd133f1cac4c5cec7f4311c6576acc..f142fa92b471a7c02d273c463b4395b5e21a01a6 100644 Binary files a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments.gen and b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments.gen differ diff --git a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments_3 b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments_4 similarity index 58% rename from PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments_3 rename to PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments_4 index 9fbf64f0dd8c5abf9ec17478a5bd5ce7dae6ddf2..8a32c48ed7cff12ba47ee81947409c413279fc9f 100644 Binary files a/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments_3 and b/PC/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments_4 differ diff --git a/PC/AirCursorPCServer/bin/eszkozok/BTSPPServer.class b/PC/AirCursorPCServer/bin/eszkozok/BTSPPServer.class index f5900bb1649cc90f1d037bd22bd3d667a2d1be92..4b7cabfa7584b9354979cb763be1ed6e7baaf865 100644 Binary files a/PC/AirCursorPCServer/bin/eszkozok/BTSPPServer.class and b/PC/AirCursorPCServer/bin/eszkozok/BTSPPServer.class differ diff --git a/PC/AirCursorPCServer/bin/fo/Main.class b/PC/AirCursorPCServer/bin/fo/Main.class index e1ab1b3f9db99c7f239d9f7b89c48be7d7747fb9..10763b9914dabd1e10ae9d8c881fa84a0a9bc30c 100644 Binary files a/PC/AirCursorPCServer/bin/fo/Main.class and b/PC/AirCursorPCServer/bin/fo/Main.class differ diff --git a/PC/AirCursorPCServer/src/eszkozok/BTSPPServer.java b/PC/AirCursorPCServer/src/eszkozok/BTSPPServer.java index ff9402871776b6b369dbb495e73dc8e112e50ba0..cc1747fc4fb44e9c8a99a0c231bb2dca8808d486 100644 --- a/PC/AirCursorPCServer/src/eszkozok/BTSPPServer.java +++ b/PC/AirCursorPCServer/src/eszkozok/BTSPPServer.java @@ -85,6 +85,8 @@ public class BTSPPServer try { String lineRead = bReader.readLine(); + if(lineRead == null) + break; byte[] be = Base64.getDecoder().decode(lineRead); UzenetKezel(be); @@ -106,12 +108,12 @@ public class BTSPPServer } } //send response to spp client - OutputStream outStream = connection.openOutputStream(); - PrintWriter pWriter = new PrintWriter(new OutputStreamWriter(outStream)); - pWriter.write("Response String from SPP Server\r\n"); - pWriter.flush(); + //OutputStream outStream = connection.openOutputStream(); + //PrintWriter pWriter = new PrintWriter(new OutputStreamWriter(outStream)); + //pWriter.write("Response String from SPP Server\r\n"); + //pWriter.flush(); - pWriter.close(); + //pWriter.close(); streamConnNotifier.close(); } catch (Exception e) diff --git a/PC/AirCursorPCServer/src/fo/Main.java b/PC/AirCursorPCServer/src/fo/Main.java index 717c31101461d4fd5ed66e05b0fa14372e0118b8..22f7ebc44c5b1050ae43ca59900fabecf725cc95 100644 --- a/PC/AirCursorPCServer/src/fo/Main.java +++ b/PC/AirCursorPCServer/src/fo/Main.java @@ -21,23 +21,25 @@ public class Main { e.printStackTrace(); } - - LocalDevice localDevice = null; - try - { - localDevice = LocalDevice.getLocalDevice(); - } - catch (BluetoothStateException e) + + while (true)//Debug mindig ujraindulo szerver, ha lecsatlakozik r�la a tel�. V�rja a k�vi csatlakoz�st. { - e.printStackTrace(); + LocalDevice localDevice = null; + try + { + localDevice = LocalDevice.getLocalDevice(); + } + catch (BluetoothStateException e) + { + e.printStackTrace(); + } + + System.out.println("Address: " + localDevice.getBluetoothAddress()); + System.out.println("Name: " + localDevice.getFriendlyName()); + + BTSPPServer sampleSPPServer = new BTSPPServer(); + sampleSPPServer.startServer(); } - System.out.println("Address: " + localDevice.getBluetoothAddress()); - System.out.println("Name: " + localDevice.getFriendlyName()); - - BTSPPServer sampleSPPServer = new BTSPPServer(); - sampleSPPServer.startServer(); - - } }