LSNBLDR-928 - Move variables into static (sakaiproject#5236)

csev · ottenhoff · commit 11c4b86b9a60 · 2018-02-09T10:59:36.000-05:00
(cherry picked from commit 96222bd)
diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java
@@ -92,14 +92,14 @@ public void setMemoryService(MemoryService m) {
 	memoryService = m;
     }
 
-    private ToolManager toolManager;    
-    public void setToolManager(ToolManager toolManager) {
-		this.toolManager = toolManager;
+    private static ToolManager toolManager;
+    public void setToolManager(ToolManager tm) {
+		if (toolManager == null ) toolManager = tm;
 	}
     
-    private SiteService siteService;    
-	public void setSiteService(SiteService siteService) {
-		siteService = siteService;
+    private static SiteService siteService;
+	public void setSiteService(SiteService sm) {
+		if (siteService == null ) siteService = sm;
 	}
 
 	static MessageLocator messageLocator = null;

Original file line number	Diff line number	Diff line change
`@@ -92,14 +92,14 @@ public void setMemoryService(MemoryService m) {`
`92`	`92`	`memoryService = m;`
`93`	`93`	`}`
`94`	`94`
`95`		`- private ToolManager toolManager;`
`96`		`- public void setToolManager(ToolManager toolManager) {`
`97`		`- this.toolManager = toolManager;`
	`95`	`+ private static ToolManager toolManager;`
	`96`	`+ public void setToolManager(ToolManager tm) {`
	`97`	`+ if (toolManager == null ) toolManager = tm;`
`98`	`98`	`}`
`99`	`99`
`100`		`- private SiteService siteService;`
`101`		`- public void setSiteService(SiteService siteService) {`
`102`		`- siteService = siteService;`
	`100`	`+ private static SiteService siteService;`
	`101`	`+ public void setSiteService(SiteService sm) {`
	`102`	`+ if (siteService == null ) siteService = sm;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`static MessageLocator messageLocator = null;`