got rid of double owner fields

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@13969 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2008-12-30 02:35:24 +00:00
1 parent 2b4892d835
commit e75c7768b8
3 files changed
+15 -16

No files matched your search

+5 -10
View File
@@ -24,9 +24,6 @@ import java.text.ParseException;
* @author Kohsuke Kawaguchi
*/
public class ListView extends View {
private final Hudson owner;
/**
* List of job names. This is what gets serialized.
*/
@@ -45,10 +42,8 @@ public class ListView extends View {
@DataBoundConstructor
public ListView(String name) {
super(name);
this.owner = Hudson.getInstance();
}
/**
* Returns a read-only view of all {@link Job}s in this view.
*
@@ -65,7 +60,7 @@ public class ListView extends View {
includePattern = Pattern.compile(includeRegex);
}
for (TopLevelItem item : owner.getItems()) {
for (TopLevelItem item : Hudson.getInstance().getItems()) {
String itemName = item.getName();
if (includePattern.matcher(itemName).matches()) {
names.add(itemName);
@@ -77,7 +72,7 @@ public class ListView extends View {
List<TopLevelItem> items = new ArrayList<TopLevelItem>(names.size());
for (String name : names) {
TopLevelItem item = owner.getItem(name);
TopLevelItem item = Hudson.getInstance().getItem(name);
if(item!=null)
items.add(item);
}
@@ -85,7 +80,7 @@ public class ListView extends View {
}
public TopLevelItem getItem(String name) {
return owner.getItem(name);
return Hudson.getInstance().getItem(name);
}
public TopLevelItem getJob(String name) {
@@ -101,7 +96,7 @@ public class ListView extends View {
}
public Item doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
Item item = owner.doCreateItem(req, rsp);
Item item = Hudson.getInstance().doCreateItem(req, rsp);
if(item!=null) {
jobNames.add(item.getName());
owner.save();
@@ -125,7 +120,7 @@ public class ListView extends View {
req.setCharacterEncoding("UTF-8");
jobNames.clear();
for (TopLevelItem item : owner.getItems()) {
for (TopLevelItem item : Hudson.getInstance().getItems()) {
if(req.getParameter(item.getName())!=null)
jobNames.add(item.getName());
}
+3 -6
View File
@@ -19,12 +19,9 @@ import org.kohsuke.stapler.DataBoundConstructor;
* @author Tom Huybrechts
*/
public class MyView extends View {
private final Hudson owner;
@DataBoundConstructor
public MyView(String name) {
super(name);
this.owner = Hudson.getInstance();
}
@Override
@@ -35,18 +32,18 @@ public class MyView extends View {
@Override
public Item doCreateItem(StaplerRequest req, StaplerResponse rsp)
throws IOException, ServletException {
return owner.doCreateItem(req, rsp);
return Hudson.getInstance().doCreateItem(req, rsp);
}
@Override
public TopLevelItem getItem(String name) {
return owner.getItem(name);
return Hudson.getInstance().getItem(name);
}
@Override
public Collection<TopLevelItem> getItems() {
List<TopLevelItem> items = new ArrayList<TopLevelItem>();
for (TopLevelItem item : owner.getItems()) {
for (TopLevelItem item : Hudson.getInstance().getItems()) {
if (item.hasPermission(Job.CONFIGURE)) {
items.add(item);
}
@@ -108,6 +108,13 @@ public abstract class View extends AbstractModelObject implements AccessControll
owner.onViewRenamed(this,oldName,newName);
}
/**
* Gets the {@link ViewGroup} that this view belongs to.
*/
public ViewGroup getOwner() {
return owner;
}
/**
* Message displayed in the top page. Can be null. Includes HTML.
*/