Procházet zdrojové kódy

Adding code style warning back

Zoey76 před 8 roky
rodič
revize
d7ce8e2227

+ 1 - 1
.settings/org.eclipse.jdt.core.prefs

@@ -76,7 +76,7 @@ org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

+ 27 - 10
src/main/java/com/l2jserver/gameserver/ThreadPoolManager.java

@@ -99,11 +99,11 @@ public class ThreadPoolManager
 			}
 		}
 	}
-
-	private ScheduledThreadPoolExecutor _effectsScheduledThreadPool;
-	private ScheduledThreadPoolExecutor _generalScheduledThreadPool;
-	private ScheduledThreadPoolExecutor _aiScheduledThreadPool;
-	private ScheduledThreadPoolExecutor _eventScheduledThreadPool;
+	
+	private final ScheduledThreadPoolExecutor _effectsScheduledThreadPool;
+	private final ScheduledThreadPoolExecutor _generalScheduledThreadPool;
+	private final ScheduledThreadPoolExecutor _aiScheduledThreadPool;
+	private final ScheduledThreadPoolExecutor _eventScheduledThreadPool;
 	private final ThreadPoolExecutor _generalPacketsThreadPool;
 	private final ThreadPoolExecutor _ioPacketsThreadPool;
 	private final ThreadPoolExecutor _generalThreadPool;
@@ -127,7 +127,7 @@ public class ThreadPoolManager
 		_aiScheduledThreadPool = new ScheduledThreadPoolExecutor(Config.AI_MAX_THREAD, new PriorityThreadFactory("AISTPool", Thread.NORM_PRIORITY));
 		_eventThreadPool = new ThreadPoolExecutor(Config.EVENT_MAX_THREAD, Config.EVENT_MAX_THREAD + 2, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new PriorityThreadFactory("Event Pool", Thread.NORM_PRIORITY));
 		
-		scheduleGeneralAtFixedRate(new PurgeTask(), 10, 5, TimeUnit.MINUTES);
+		scheduleGeneralAtFixedRate(new PurgeTask(_effectsScheduledThreadPool, _generalScheduledThreadPool, _aiScheduledThreadPool, _eventThreadPool), 10, 5, TimeUnit.MINUTES);
 	}
 	
 	/**
@@ -694,13 +694,30 @@ public class ThreadPoolManager
 	
 	protected class PurgeTask implements Runnable
 	{
+		private final ScheduledThreadPoolExecutor _effectsScheduled;
+		
+		private final ScheduledThreadPoolExecutor _generalScheduled;
+		
+		private final ScheduledThreadPoolExecutor _aiScheduled;
+		
+		private final ThreadPoolExecutor _eventScheduled;
+		
+		PurgeTask(ScheduledThreadPoolExecutor effectsScheduledThreadPool, ScheduledThreadPoolExecutor generalScheduledThreadPool, //
+			ScheduledThreadPoolExecutor aiScheduledThreadPool, ThreadPoolExecutor eventScheduledThreadPool)
+		{
+			_effectsScheduled = effectsScheduledThreadPool;
+			_generalScheduled = generalScheduledThreadPool;
+			_aiScheduled = aiScheduledThreadPool;
+			_eventScheduled = eventScheduledThreadPool;
+		}
+		
 		@Override
 		public void run()
 		{
-			_effectsScheduledThreadPool.purge();
-			_generalScheduledThreadPool.purge();
-			_aiScheduledThreadPool.purge();
-			_eventScheduledThreadPool.purge();
+			_effectsScheduled.purge();
+			_generalScheduled.purge();
+			_aiScheduled.purge();
+			_eventScheduled.purge();
 		}
 	}
 	

+ 2 - 2
src/main/java/com/l2jserver/gameserver/data/json/ExperienceData.java

@@ -48,7 +48,7 @@ public final class ExperienceData
 	}.getType();
 	private final Map<Integer, Long> _expTable = new HashMap<>();
 	
-	private ExperienceData()
+	ExperienceData()
 	{
 		load();
 	}
@@ -99,6 +99,6 @@ public final class ExperienceData
 	
 	private static class SingletonHolder
 	{
-		private static final ExperienceData _instance = new ExperienceData();
+		static final ExperienceData _instance = new ExperienceData();
 	}
 }