Skip to content

Commit 87edf54

Browse files
eselmeistereselmeister
authored
Merge pull request #2074 from Mailaender/no-gc
Avoid manual garbage collection
2 parents d1a2719 + 3eea230 commit 87edf54

File tree

24 files changed

+36
-101
lines changed

24 files changed

+36
-101
lines changed

‎chemclipse/plugins/org.eclipse.chemclipse.ux.extension.msd.ui/src/org/eclipse/chemclipse/ux/extension/msd/ui/editors/MassSpectrumEditor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ private void preDestroy() {
137137
part.setVisible(false);
138138
partStack.getChildren().remove(part);
139139
}
140-
/*
141-
* Run the garbage collector.
142-
*/
143-
System.gc();
144140
}
145141

146142
@Persist

‎chemclipse/plugins/org.eclipse.chemclipse.ux.extension.pcr.ui/src/org/eclipse/chemclipse/ux/extension/pcr/ui/editors/PlateEditorPCR.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ public void run() {
108108
}
109109
});
110110
}
111-
/*
112-
* Run the garbage collector.
113-
*/
114-
System.gc();
115111
}
116112

117113
@Persist

‎chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorTSD.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2021, 2024 Lablicate GmbH.
2+
* Copyright (c) 2021, 2025 Lablicate GmbH.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
@@ -95,10 +95,6 @@ public void run() {
9595
}
9696
});
9797
}
98-
/*
99-
* Run the garbage collector.
100-
*/
101-
System.gc();
10298
}
10399

104100
@Persist

‎chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/QuantitationDatabaseEditor.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2018, 2024 Lablicate GmbH.
2+
* Copyright (c) 2018, 2025 Lablicate GmbH.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
@@ -100,10 +100,6 @@ public void run() {
100100
}
101101
});
102102
}
103-
/*
104-
* Run the garbage collector.
105-
*/
106-
System.gc();
107103
}
108104

109105
@Persist

‎chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorFSD.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ public void run() {
107107
}
108108
});
109109
}
110-
/*
111-
* Run the garbage collector.
112-
*/
113-
System.gc();
114110
}
115111

116112
@Persist

‎chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorVSD.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ public void run() {
107107
}
108108
});
109109
}
110-
/*
111-
* Run the garbage collector.
112-
*/
113-
System.gc();
114110
}
115111

116112
@Persist

‎chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorWSD.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2018, 2024 Lablicate GmbH.
2+
* Copyright (c) 2018, 2025 Lablicate GmbH.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
@@ -107,10 +107,6 @@ public void run() {
107107
}
108108
});
109109
}
110-
/*
111-
* Run the garbage collector.
112-
*/
113-
System.gc();
114110
}
115111

116112
@Persist

‎chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/SequenceEditor.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2018, 2024 Lablicate GmbH.
2+
* Copyright (c) 2018, 2025 Lablicate GmbH.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
@@ -97,10 +97,6 @@ public void run() {
9797
}
9898
});
9999
}
100-
/*
101-
* Run the garbage collector.
102-
*/
103-
System.gc();
104100
}
105101

106102
@Persist

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.classifier.supplier.wnc.fragment.test/src/org/eclipse/chemclipse/chromatogram/msd/classifier/supplier/wnc/internal/core/support/Calculator_2_ITest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2018 Lablicate GmbH.
2+
* Copyright (c) 2011, 2025 Lablicate GmbH.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
@@ -44,9 +44,6 @@ protected void tearDown() throws Exception {
4444

4545
calculator = null;
4646
wncIons = null;
47-
//
48-
System.gc();
49-
//
5047
super.tearDown();
5148
}
5249

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.classifier.supplier.wnc.fragment.test/src/org/eclipse/chemclipse/chromatogram/msd/classifier/supplier/wnc/internal/core/support/ChromatogramTestCase.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Lablicate GmbH.
2+
* Copyright (c) 2011, 2025 Lablicate GmbH.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
@@ -74,18 +74,16 @@ protected void setUp() throws Exception {
7474
protected void tearDown() throws Exception {
7575

7676
PreferenceSupplier.setImportDelimiter(Delimiter.COMMA);
77-
//
77+
7878
chromatogram = null;
7979
chromatogramSelection = null;
8080
chromatogramFile.delete();
81-
//
82-
System.gc();
83-
//
81+
8482
super.tearDown();
8583
}
8684

8785
public IChromatogramSelectionMSD getChromatogramSelection() {
8886

8987
return chromatogramSelection;
9088
}
91-
}
89+
}

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.backfolding.fragment.test/src/org/eclipse/chemclipse/chromatogram/msd/filter/supplier/backfolding/core/ChromatogramImporterTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Lablicate GmbH.
2+
* Copyright (c) 2011, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -50,9 +50,7 @@ protected void tearDown() throws Exception {
5050

5151
chromatogram = null;
5252
chromatogramSelection = null;
53-
//
54-
System.gc();
55-
//
53+
5654
super.tearDown();
5755
}
5856
}

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.coda.fragment.test/src/org/eclipse/chemclipse/chromatogram/msd/filter/supplier/coda/calculator/MassChromatographicQualityCalculator_1_ITest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2022 Lablicate GmbH.
2+
* Copyright (c) 2011, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -52,9 +52,7 @@ protected void tearDown() throws Exception {
5252
importFile = null;
5353
chromatogram = null;
5454
chromatogramSelection = null;
55-
//
56-
System.gc();
57-
//
55+
5856
super.tearDown();
5957
}
6058

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.coda.fragment.test/src/org/eclipse/chemclipse/chromatogram/msd/filter/supplier/coda/calculator/MassChromatographicQualityResult_1_ITest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2022 Lablicate GmbH.
2+
* Copyright (c) 2011, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -49,9 +49,7 @@ protected void tearDown() throws Exception {
4949
importFile = null;
5050
chromatogram = null;
5151
chromatogramSelection = null;
52-
//
53-
System.gc();
54-
//
52+
5553
super.tearDown();
5654
}
5755

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.coda.fragment.test/src/org/eclipse/chemclipse/chromatogram/msd/filter/supplier/coda/core/CodaFilter_1_ITest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ protected void tearDown() throws Exception {
3333

3434
chromatogramFilter = null;
3535
chromatogramFilterSettings = null;
36-
//
37-
System.gc();
38-
//
36+
3937
super.tearDown();
4038
}
4139

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.dyson.fragment.test/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/noise/dyson/core/ChromatogramReaderTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2014, 2024 Lablicate GmbH.
2+
* Copyright (c) 2014, 2025 Lablicate GmbH.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
@@ -45,9 +45,7 @@ protected void tearDown() throws Exception {
4545
pathImport = null;
4646
fileImport = null;
4747
chromatogram = null;
48-
//
49-
System.gc();
50-
//
48+
5149
super.tearDown();
5250
}
5351
}

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.stein.fragment.test/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/noise/stein/core/ChromatogramReaderTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2014, 2024 Lablicate GmbH.
2+
* Copyright (c) 2014, 2025 Lablicate GmbH.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
@@ -45,9 +45,7 @@ protected void tearDown() throws Exception {
4545
pathImport = null;
4646
fileImport = null;
4747
chromatogram = null;
48-
//
49-
System.gc();
50-
//
48+
5149
super.tearDown();
5250
}
5351
}

‎chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.integrator.supplier.trapezoid.fragment.test/src/org/eclipse/chemclipse/chromatogram/xxd/integrator/supplier/trapezoid/internal/core/ChromatogramImportTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2008, 2022 Lablicate GmbH.
2+
* Copyright (c) 2008, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -46,9 +46,7 @@ protected void tearDown() throws Exception {
4646

4747
chromatogramSelection = null;
4848
chromatogram = null;
49-
//
50-
System.gc();
51-
//
49+
5250
super.tearDown();
5351
}
5452
}

‎chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.amdis.fragment.test/src/org/eclipse/chemclipse/msd/converter/supplier/amdis/io/MassSpectrumExportConverterTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2008, 2022 Lablicate GmbH.
2+
* Copyright (c) 2008, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -55,9 +55,7 @@ protected void tearDown() throws Exception {
5555
exportConverter = null;
5656
importConverter = null;
5757
massSpectra = null;
58-
//
59-
System.gc();
60-
//
58+
6159
super.tearDown();
6260
}
6361
}

‎chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.excel.fragment.test/src/org/eclipse/chemclipse/msd/converter/supplier/excel/io/ChromatogramReaderTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Lablicate GmbH.
2+
* Copyright (c) 2011, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -45,9 +45,7 @@ protected void tearDown() throws Exception {
4545
pathImport = null;
4646
fileImport = null;
4747
chromatogram = null;
48-
//
49-
System.gc();
50-
//
48+
5149
super.tearDown();
5250
}
5351
}

‎chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.csv.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/csv/io/ChromatogramReaderTestCase.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Lablicate GmbH.
2+
* Copyright (c) 2011, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -45,9 +45,7 @@ protected void tearDown() throws Exception {
4545
pathImport = null;
4646
fileImport = null;
4747
chromatogram = null;
48-
//
49-
System.gc();
50-
//
48+
5149
super.tearDown();
5250
}
53-
}
51+
}

‎chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderFIDTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2014, 2024 Lablicate GmbH.
2+
* Copyright (c) 2014, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -50,9 +50,7 @@ protected void tearDown() throws Exception {
5050
pathImport = null;
5151
fileImport = null;
5252
chromatogram = null;
53-
//
54-
System.gc();
55-
//
53+
5654
super.tearDown();
5755
}
5856
}

‎chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderMSDTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2014, 2024 Lablicate GmbH.
2+
* Copyright (c) 2014, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -50,9 +50,7 @@ protected void tearDown() throws Exception {
5050
pathImport = null;
5151
fileImport = null;
5252
chromatogram = null;
53-
//
54-
System.gc();
55-
//
53+
5654
super.tearDown();
5755
}
5856
}

‎chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderWSDTestCase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2015, 2024 Lablicate GmbH.
2+
* Copyright (c) 2015, 2025 Lablicate GmbH.
33
*
44
* All rights reserved.
55
* This program and the accompanying materials are made available under the
@@ -50,9 +50,7 @@ protected void tearDown() throws Exception {
5050
pathImport = null;
5151
fileImport = null;
5252
chromatogram = null;
53-
//
54-
System.gc();
55-
//
53+
5654
super.tearDown();
5755
}
5856
}

0 commit comments

Comments
 (0)