Commit after merge

main
Ishant 2025-06-09 12:19:49 +05:30
parent 560ddd9b3f
commit 35524ed9ad
17 changed files with 59 additions and 67 deletions

View File

@ -1,2 +1,2 @@
# collaborative project sync baselines
#Fri Jun 06 19:39:40 IST 2025
#Mon Jun 09 12:19:01 IST 2025

View File

@ -664,3 +664,48 @@ java.lang.IllegalArgumentException:
at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:651)
at org.eclipse.equinox.launcher.Main.basicRun(Main.java:588)
at org.eclipse.equinox.launcher.Main.run(Main.java:1459)
!SESSION 2025-06-06 19:39:45.223 -----------------------------------------------
eclipse.buildId=24.2.2.241212101923-2844c44
java.version=17.0.11
java.vendor=Eclipse Adoptium
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=en_IN
Command-line arguments: -os win32 -ws win32 -arch x86_64
!ENTRY org.eclipse.core.resources 4 273 2025-06-09 12:19:03.133
!MESSAGE Problems cleaning up history store.
!STACK 1
org.eclipse.core.internal.resources.ResourceException(null)[567]: java.io.EOFException
at java.base/java.io.DataInputStream.readUnsignedShort(Unknown Source)
at java.base/java.io.DataInputStream.readUTF(Unknown Source)
at java.base/java.io.DataInputStream.readUTF(Unknown Source)
at org.eclipse.core.internal.localstore.Bucket.readEntryKey(Bucket.java:387)
at org.eclipse.core.internal.localstore.Bucket.loadEntries(Bucket.java:378)
at org.eclipse.core.internal.localstore.Bucket.load(Bucket.java:343)
at org.eclipse.core.internal.localstore.Bucket.load(Bucket.java:310)
at org.eclipse.core.internal.localstore.BucketTree.internalAccept(BucketTree.java:108)
at org.eclipse.core.internal.localstore.BucketTree.internalAccept(BucketTree.java:119)
at org.eclipse.core.internal.localstore.BucketTree.accept(BucketTree.java:83)
at org.eclipse.core.internal.localstore.HistoryStore2.clean(HistoryStore2.java:189)
at org.eclipse.core.internal.resources.SaveManager.save(SaveManager.java:1253)
at org.eclipse.core.internal.resources.Workspace.save(Workspace.java:2494)
at de.ikv.medini.cockpit.WorkbenchHelper.lambda$1(WorkbenchHelper.java:74)
at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:122)
!SUBENTRY 1 org.eclipse.core.resources 4 567 2025-06-09 12:19:03.139
!MESSAGE Could not read metadata for 'C:\Users\VTPL\Documents\Fusa_Medini\.metadata\.plugins\org.eclipse.core.resources\.projects\FuSa_BMS_2W\.indexes\2c\history.index'.
!STACK 0
java.io.EOFException
at java.base/java.io.DataInputStream.readUnsignedShort(Unknown Source)
at java.base/java.io.DataInputStream.readUTF(Unknown Source)
at java.base/java.io.DataInputStream.readUTF(Unknown Source)
at org.eclipse.core.internal.localstore.Bucket.readEntryKey(Bucket.java:387)
at org.eclipse.core.internal.localstore.Bucket.loadEntries(Bucket.java:378)
at org.eclipse.core.internal.localstore.Bucket.load(Bucket.java:343)
at org.eclipse.core.internal.localstore.Bucket.load(Bucket.java:310)
at org.eclipse.core.internal.localstore.BucketTree.internalAccept(BucketTree.java:108)
at org.eclipse.core.internal.localstore.BucketTree.internalAccept(BucketTree.java:119)
at org.eclipse.core.internal.localstore.BucketTree.accept(BucketTree.java:83)
at org.eclipse.core.internal.localstore.HistoryStore2.clean(HistoryStore2.java:189)
at org.eclipse.core.internal.resources.SaveManager.save(SaveManager.java:1253)
at org.eclipse.core.internal.resources.Workspace.save(Workspace.java:2494)
at de.ikv.medini.cockpit.WorkbenchHelper.lambda$1(WorkbenchHelper.java:74)
at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:122)

View File

@ -1,5 +1,5 @@
#Medini Cockpit state persistence file. This file is a generated file. Do not modify the content of this file!
#Fri Jun 06 19:40:58 IST 2025
#Mon Jun 09 12:19:03 IST 2025
FuSa_BMS_2W=platform\:/resource/FuSa_BMS_2W/.project.medini
VEC_FuSa_HeavyVehicles=platform\:/resource/VEC_FuSa_HeavyVehicles/.project.medini
ESL=platform\:/resource/ESL/.project.medini

View File

@ -1,2 +0,0 @@
#safe table
#Wed Jun 04 16:18:36 IST 2025

View File

@ -1,2 +0,0 @@
#safe table
#Fri Jun 06 19:39:42 IST 2025

View File

@ -0,0 +1,2 @@
#safe table
#Mon Jun 09 12:19:03 IST 2025

File diff suppressed because one or more lines are too long

View File

@ -1,9 +1,9 @@
#Wed Jun 04 16:15:56 IST 2025
#Mon Jun 09 12:19:02 IST 2025
rulergrid.rulerunit=1
print.margin.left=0.5
viewport.x=159
viewport.x=172
rulergrid.gridlinestyle=6
viewport.y=2
viewport.y=117
zoom=0.5
print.useMillim=true
print.usePortrait=true

View File

@ -1,19 +1,10 @@
<<<<<<< HEAD
#Fri Jun 06 19:39:41 IST 2025
#Mon Jun 09 12:19:01 IST 2025
rulergrid.rulerunit=1
print.margin.left=0.5
viewport.x=3289
rulergrid.gridlinestyle=6
viewport.y=132
zoom=1.0
=======
#Wed Jun 04 16:15:55 IST 2025
rulergrid.rulerunit=1
print.margin.left=0.5
viewport.x=96
viewport.x=109
rulergrid.gridlinestyle=6
viewport.y=0
zoom=0.25
>>>>>>> origin/main
print.useMillim=true
print.usePortrait=true
print.page.height=11.6929134