Context Navigation

← Previous Changeset
Next Changeset →

Changeset 450

Timestamp:

08/13/08 11:41:16 (5 years ago)

Author:

goldfd

Message:

SampleListEx?- Now displays a check or an X for public data.

Deleting a sample, subsample, or chemical analysis will redirect you to a page up in the heirarchy (chemical analysis -> subsample, subsample -> sample, sample -> all my samples).

Added a message for no samples returning from the All My Samples page, and a message for no projects from the projects page.

SubsampleDetails? now displays the image viewer class.

Location:

trunk

Files:

: 2 added
: 13 modified

mpdb-client/src/edu/rpi/metpetdb/client/ui/TokenSpace.java (modified) (1 diff)
mpdb-client/src/edu/rpi/metpetdb/client/ui/image/browser/ImageListViewer.java (modified) (6 diffs)
mpdb-client/src/edu/rpi/metpetdb/client/ui/input/ObjectEditorPanel.java (modified) (2 diffs)
mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/ChemicalAnalysisDetails.java (modified) (4 diffs)
mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/SampleDetails.java (modified) (3 diffs)
mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/SubsampleDetails.java (modified) (12 diffs)
mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/ProjectListEx.java (modified) (1 diff)
mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/SampleListEx.java (modified) (2 diffs)
mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/UserProjectsListEx.java (modified) (2 diffs)
mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/UserSamplesList.java (modified) (1 diff)
mpdb-common/src/edu/rpi/metpetdb/client/locale/LocaleText.java (modified) (2 diffs)
mpdb-common/src/edu/rpi/metpetdb/client/locale/LocaleText.properties (modified) (2 diffs)
mpdb-common/src/edu/rpi/metpetdb/public/images/checkmark.jpg (added)
mpdb-common/src/edu/rpi/metpetdb/public/images/xmark.jpg (added)
mpdb-common/src/edu/rpi/metpetdb/public/style/elements.css (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/TokenSpace.java

r426	r450
130	130
131	131	public void execute(final long id) {
132		show(new ImageListViewer(id));
	132	show(new ImageListViewer(id, true));
133	133	}
134	134	};

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/image/browser/ImageListViewer.java

r341	r450
2	2
3	3	import java.util.ArrayList;
	4	import java.util.Collection;
4	5	import java.util.HashSet;
5	6	import java.util.Iterator;
…	…
7	8	import com.google.gwt.user.client.History;
8	9	import com.google.gwt.user.client.ui.Button;
	10	import com.google.gwt.user.client.ui.ChangeListener;
9	11	import com.google.gwt.user.client.ui.ClickListener;
10	12	import com.google.gwt.user.client.ui.FlexTable;
…	…
14	16	import com.google.gwt.user.client.ui.Image;
15	17	import com.google.gwt.user.client.ui.Label;
	18	import com.google.gwt.user.client.ui.ListBox;
16	19	import com.google.gwt.user.client.ui.Widget;
17		~~import com.google.gwt.widgetideas.table.client.FixedWidthFlexTable;~~
18	20
19	21	import edu.rpi.metpetdb.client.model.ImageDTO;
	22	import edu.rpi.metpetdb.client.model.SubsampleDTO;
20	23	import edu.rpi.metpetdb.client.ui.MpDb;
21	24	import edu.rpi.metpetdb.client.ui.ServerOp;
…	…
27	30	public class ImageListViewer extends FlowPanel implements ClickListener {
28	31	private ArrayList images;
29
30		public ImageListViewer(final long subsampleId) {
	32	private final long id;
	33	private FlowPanel fp;
	34	private ListBox lb;
	35	private Label imagesLabel;
	36	private FlexTable noImagesContainer = new FlexTable();
	37
	38	public ImageListViewer(final long subsampleId, final boolean isScreen) {
	39	this(subsampleId, isScreen, null);
	40	}
	41
	42	public ImageListViewer(final long subsampleId, final String type) {
	43	this(subsampleId, true, type);
	44	}
	45
	46	private ImageListViewer(final long subsampleId, final boolean isScreen,
	47	final String type) {
	48	id = subsampleId;
	49	fp = new FlowPanel();
31	50	new ServerOp() {
32	51	public void begin() {
33		MpDb.image_svc.allImages(~~subsampleI~~d, this);
	52	MpDb.image_svc.allImages(id, this);
34	53	}
35	54	public void onSuccess(final Object result) {
…	…
39	58	images = (ArrayList) ((ArrayList) result).clone();
40	59	if (images == null \|\| images.size() <= 0) {
41		add(new Label("No Image"));
	60	add(new Label(
	61	"There are no images associated with this subsample"));
42	62	} else {
43	63	((ImageDTO) images.get(0)).getSubsample().setImages(
44	64	new HashSet(images));
45		buildInterface();
	65	buildInterface(isScreen, type);
46	66	}
47	67	}
…	…
51	71	}
52	72
53		private void buildInterface() {
54
55		final FlexTable header2 = new FlexTable();
56		final Label title = new Label(((ImageDTO) images.get(0)).getSubsample()
57		.getName()
58		+ " Images");
59		final Label title2 = new Label("Images attached to");
60		final MLink subsampleLink = new MLink(((ImageDTO) images.get(0))
61		.getSubsample().getName(), TokenSpace
62		.detailsOf(((ImageDTO) images.get(0)).getSubsample()));
63		final Button addImage = new Button("Add Image", new ClickListener() {
64		public void onClick(Widget sender) {
65		History.newItem(TokenSpace.edit(((ImageDTO) images.get(0))
66		.getSubsample()));
67		}
68		});
69		title.addStyleName("big");
70		header2.setWidget(0, 0, title);
71		header2.setWidget(1, 0, title2);
72		header2.setWidget(1, 1, subsampleLink);
73		header2.setWidget(0, 1, addImage);
74		header2.getFlexCellFormatter().setColSpan(0, 1, 2);
75		header2.getFlexCellFormatter().setRowSpan(0, 1, 2);
76		header2.getFlexCellFormatter().setAlignment(0, 1,
77		HasHorizontalAlignment.ALIGN_RIGHT,
78		HasVerticalAlignment.ALIGN_MIDDLE);
79		header2.getFlexCellFormatter().setColSpan(0, 0, 2);
80		header2.getFlexCellFormatter().setWidth(1, 0, "130px");
81		header2.addStyleName("subsample-header");
82		addImage.addStyleName("addlink");
	73	private void buildInterface(final boolean isScreen, final String type) {
	74	if (isScreen) {
	75	final FlexTable header2 = new FlexTable();
	76	final Label title = new Label(((ImageDTO) images.get(0))
	77	.getSubsample().getName()
	78	+ " Images");
	79	final Label title2 = new Label("Images attached to");
	80	final MLink subsampleLink = new MLink(((ImageDTO) images.get(0))
	81	.getSubsample().getName(), TokenSpace
	82	.detailsOf(((ImageDTO) images.get(0)).getSubsample()));
	83	final Button addImage = new Button("Add Image",
	84	new ClickListener() {
	85	public void onClick(Widget sender) {
	86	History.newItem(TokenSpace.edit(((ImageDTO) images
	87	.get(0)).getSubsample()));
	88	}
	89	});
	90	title.addStyleName("big");
	91	header2.setWidget(0, 0, title);
	92	header2.setWidget(1, 0, title2);
	93	header2.setWidget(1, 1, subsampleLink);
	94	header2.setWidget(0, 1, addImage);
	95	header2.getFlexCellFormatter().setColSpan(0, 1, 2);
	96	header2.getFlexCellFormatter().setRowSpan(0, 1, 2);
	97	header2.getFlexCellFormatter().setAlignment(0, 1,
	98	HasHorizontalAlignment.ALIGN_RIGHT,
	99	HasVerticalAlignment.ALIGN_MIDDLE);
	100	header2.getFlexCellFormatter().setColSpan(0, 0, 2);
	101	header2.getFlexCellFormatter().setWidth(1, 0, "130px");
	102	header2.addStyleName("subsample-header");
	103	addImage.addStyleName("addlink");
	104	add(header2);
	105	if (type == null)
	106	createListBox(MpDb.doc.Image_imageType.getValues(), null);
	107	else
	108	createListBox(MpDb.doc.Image_imageType.getValues(), type);
	109	}
	110
83	111	final FlexTable header = new FlexTable();
84
85		final FixedWidthFlexTable ft = new FixedWidthFlexTable();
86		final Label imagesLabel = new Label("Images");
	112	imagesLabel = new Label();
87	113	imagesLabel.addStyleName("bold");
88	114	header.setWidget(1, 0, imagesLabel);
89	115	header.getFlexCellFormatter().setHeight(1, 0, "38px");
90	116	header.setWidth("100%");
91		~~ft.setWidth("100%");~~
92		~~ft.addStyleName("subsample-imagetypes");~~
93		~~ft.setCellSpacing(10);~~
94	117	header.getRowFormatter().setStyleName(1, "mpdb-dataTableLightBlue");
95		int row = 0;
96		ft.setHeight("500px");
97		for (int i = 0; i < 5; i++) {
98		ft.insertRow(i);
99		ft.getFlexCellFormatter().setHeight(i, 0, "90px");
100		}
101		for (int i = 0; i < 3; i++)
102		ft.addCell(0);
103		final Iterator itr = images.iterator();
	118
	119	add(header);
	120
	121	loadimages(isScreen, type);
	122	}
	123
	124	private void createListBox(final Collection<?> items, final String selected) {
	125	lb = new ListBox();
	126
	127	lb.setVisibleItemCount(1);
	128
	129	final Iterator<?> itr = items.iterator();
	130	lb.addItem("All");
	131	int index = 1;
104	132	while (itr.hasNext()) {
105		for (int i = 0; i < 4; i++) {
106		if (itr.hasNext()) {
107		final FlexTable cell = new FlexTable();
108		final ImageDTO currentImage = (ImageDTO) itr.next();
109		final Image image = new Image();
110		image.setUrl(currentImage.get64x64ServerPath());
111		final Image bigImage = new Image();
112		bigImage.setUrl(currentImage.getServerPath());
113		final int index = (row * 4) + i;
114		final ImageHyperlink imageLink = new ImageHyperlink(image,
115		new ClickListener() {
116		public void onClick(final Widget sender) {
117		new ViewImage(images, bigImage, index)
118		.show();
119		}
120		});
121		// final MLink imageLink = new MLink("hi",
122		// new ClickListener() {
123		// public void onClick(final Widget sender) {
124		// new ViewImage(images, bigImage).show();
125		// }
126		// });
127		// imageLink.setStyleName("ssimg");
128		cell.setWidget(0, 0, imageLink);
129		cell.getFlexCellFormatter().setRowSpan(0, 0, 2);
130		final Label imageTitle = new Label(
131		parseFilename(currentImage.getFilename()));
132		final Label imageType = new Label(currentImage
133		.getImageType());
134		imageTitle.addStyleName("bold");
135		imageTitle.addStyleName("white");
136		imageType.addStyleName("white");
137		cell.setWidget(0, 1, imageTitle);
138		cell.setWidget(1, 0, imageType);
139		cell.setCellSpacing(5);
140		cell.getFlexCellFormatter().setAlignment(0, 0,
141		HasHorizontalAlignment.ALIGN_CENTER,
142		HasVerticalAlignment.ALIGN_MIDDLE);
143		ft.setWidget(row, i, cell);
	133	final Object o = itr.next();
	134	lb.addItem(o.toString());
	135	if (selected != null && o.equals(selected)) {
	136	lb.setItemSelected(index, true);
	137	}
	138	++index;
	139	}
	140
	141	lb.setItemSelected(lb.getSelectedIndex(), true);
	142
	143	lb.addChangeListener(new ChangeListener() {
	144	public void onChange(final Widget w) {
	145	loadimages(true, lb.getValue(lb.getSelectedIndex()));
	146	}
	147	});
	148
	149	add(lb);
	150	}
	151
	152	private void loadimages(final boolean isScreen, final String type) {
	153	if (noImagesContainer.isAttached())
	154	remove(noImagesContainer);
	155	fp.clear();
	156	fp.addStyleName("subsample-imagetypes");
	157	final ArrayList imagesToDisplay = new ArrayList();
	158	imagesLabel.setText("Images");
	159	if (type != null && !type.equals("All")) {
	160	imagesLabel.setText(type);
	161	for (int i = 0; i < images.size(); i++) {
	162	if (((ImageDTO) images.get(i)).getImageType().equals(type)) {
	163	imagesToDisplay.add(images.get(i));
144	164	}
145	165	}
146		++row;
147		}
148		add(header2);
149		add(header);
150		add(ft);
	166	} else {
	167	imagesToDisplay.addAll(images);
	168	}
	169
	170	final Iterator itr = imagesToDisplay.iterator();
	171	int i = 0;
	172	while (itr.hasNext()) {
	173	final FlexTable cell = new FlexTable();
	174	cell.setStyleName("inline");
	175	final ImageDTO currentImage = (ImageDTO) itr.next();
	176	final Image image = new Image();
	177	image.setUrl(currentImage.get64x64ServerPath());
	178	final Image bigImage = new Image();
	179	bigImage.setUrl(currentImage.getServerPath());
	180	final int index = i;
	181	final ImageHyperlink imageLink;
	182	if (isScreen) {
	183	imageLink = new ImageHyperlink(image, new ClickListener() {
	184	public void onClick(final Widget sender) {
	185	new ViewImage(imagesToDisplay, bigImage, index).show();
	186	}
	187	});
	188	} else {
	189	imageLink = new ImageHyperlink(image, new ClickListener() {
	190	public void onClick(final Widget sender) {
	191	new ServerOp<SubsampleDTO>() {
	192	public void begin() {
	193	MpDb.subsample_svc.details(id, this);
	194	}
	195	public void onSuccess(final SubsampleDTO s) {
	196	History.newItem(TokenSpace.ViewOf(s));
	197	}
	198	}.begin();
	199	}
	200	});
	201	}
	202	cell.setWidget(0, 0, imageLink);
	203	cell.getFlexCellFormatter().setRowSpan(0, 0, 2);
	204	final Label imageTitle = new Label(parseFilename(currentImage
	205	.getFilename()));
	206	final Label imageType = new Label(currentImage.getImageType());
	207	imageTitle.addStyleName("bold");
	208	imageTitle.addStyleName("white");
	209	imageType.addStyleName("white");
	210	cell.setWidget(0, 1, imageTitle);
	211	cell.setWidget(1, 0, imageType);
	212	cell.setCellSpacing(5);
	213	cell.getFlexCellFormatter().setAlignment(0, 0,
	214	HasHorizontalAlignment.ALIGN_CENTER,
	215	HasVerticalAlignment.ALIGN_MIDDLE);
	216	fp.add(cell);
	217	i++;
	218	}
	219	if (imagesToDisplay.size() == 0) {
	220	noImagesContainer.setWidth("100%");
	221	noImagesContainer
	222	.setWidget(
	223	0,
	224	0,
	225	new Label(
	226	"There are no images of this type associated with this subsample"));
	227	noImagesContainer.getFlexCellFormatter().setAlignment(0, 0,
	228	HasHorizontalAlignment.ALIGN_CENTER,
	229	HasVerticalAlignment.ALIGN_MIDDLE);
	230	add(noImagesContainer);
	231	}
	232	add(fp);
151	233	}
152	234

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/input/ObjectEditorPanel.java

r362	r450
122	122	}
123	123	public void onFailure(final Throwable e) {
124		if (!onFailure2(e))
125		super.onFailure(e);
	124	super.onFailure(e);
126	125	}
127	126	}.begin();
…	…
196	195	Window.alert("deleted");
197	196	}
198		~~protected boolean onFailure2(final Throwable e) {~~
199		~~return false;~~
200		}
201	197	}

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/ChemicalAnalysisDetails.java

r429	r450
1	1	package edu.rpi.metpetdb.client.ui.objects.details;
2	2
	3	import com.google.gwt.user.client.History;
3	4	import com.google.gwt.user.client.rpc.AsyncCallback;
4	5	import com.google.gwt.user.client.ui.FlowPanel;
…	…
47	48
48	49	private long chemicalAnalysisId;
	50	private SubsampleDTO subsampleObj;
49	51
50	52	public ChemicalAnalysisDetails() {
…	…
64	66
65	67	protected void deleteBean(final AsyncCallback ac) {
	68	subsampleObj = ((ChemicalAnalysisDTO) getBean()).getSubsample();
66	69	MpDb.chemicalAnalysis_svc.delete(
67	70	((ChemicalAnalysisDTO) getBean()).getId(), ac);
…	…
79	82
80	83	protected void onSaveCompletion(final MObjectDTO result) {
81		TokenSpace.dispatch(TokenSpace
82		.detailsOf((ChemicalAnalysisDTO) result));
	84	if (History.getToken().equals(
	85	TokenSpace.detailsOf((ChemicalAnalysisDTO) result))) {
	86	TokenSpace.dispatch(TokenSpace
	87	.detailsOf((ChemicalAnalysisDTO) result));
	88	} else {
	89	History.newItem(TokenSpace
	90	.detailsOf((ChemicalAnalysisDTO) result));
	91	}
83	92	}
84	93
85	94	protected void onLoadCompletion(final MObjectDTO result) {
86	95	super.onLoadCompletion(result);
	96	}
	97
	98	protected void onDeleteCompletion(final Object result) {
	99	History.newItem(TokenSpace.detailsOf((subsampleObj)));
87	100	}
88	101	};

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/SampleDetails.java

r429	r450
108	108
109	109	protected void onSaveCompletion(final MObjectDTO result) {
110		TokenSpace.dispatch(TokenSpace.detailsOf((SampleDTO) result));
	110	if (History.getToken().equals(
	111	TokenSpace.detailsOf((SampleDTO) result))) {
	112	TokenSpace.dispatch(TokenSpace
	113	.detailsOf((SampleDTO) result));
	114	} else {
	115	History.newItem(TokenSpace.detailsOf((SampleDTO) result));
	116	}
111	117	}
112	118
…	…
121	127	updateGoogleMaps();
122	128	}
	129
	130	protected void onDeleteCompletion(final Object result) {
	131	History.newItem(TokenSpace.samplesForUser.makeToken(null));
	132	}
123	133	};
124	134	final OnEnterPanel.ObjectEditor oep = new OnEnterPanel.ObjectEditor(
…	…
127	137	oep.setStylePrimaryName("sd-details");
128	138	oep.addStyleName("mpdb-dataTable");
	139	oep.addStyleName("inline");
129	140	add(oep);
130	141	}

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/SubsampleDetails.java

r429	r450
10	10	import com.google.gwt.user.client.ui.HasHorizontalAlignment;
11	11	import com.google.gwt.user.client.ui.HasVerticalAlignment;
	12	import com.google.gwt.user.client.ui.HorizontalPanel;
12	13	import com.google.gwt.user.client.ui.Label;
13	14	import com.google.gwt.user.client.ui.Widget;
…	…
25	26	import edu.rpi.metpetdb.client.ui.Styles;
26	27	import edu.rpi.metpetdb.client.ui.TokenSpace;
	28	import edu.rpi.metpetdb.client.ui.image.browser.ImageListViewer;
27	29	import edu.rpi.metpetdb.client.ui.input.ObjectEditorPanel;
28	30	import edu.rpi.metpetdb.client.ui.input.OnEnterPanel;
…	…
38	40	public class SubsampleDetails extends FlowPanel {
39	41	private FlexTable ft;
	42	private HorizontalPanel hp;
40	43	private MLinkandText Header;
41	44	final Element sampleHeader;
…	…
55	58	private long subsampleId;
56	59	private long sampleId;
	60	private SampleDTO sampleObj;
57	61	private ServerOp continuation;
58	62	private String sampleAlias;
59	63	private MLink map;
	64	private Widget images;
60	65
61	66	public SubsampleDetails() {
…	…
75	80
76	81	protected void deleteBean(final AsyncCallback<Object> ac) {
	82	sampleObj = ((SubsampleDTO) getBean()).getSample();
77	83	MpDb.subsample_svc.delete(((SubsampleDTO) getBean()).getId(),
78	84	ac);
…	…
91	97	if (continuation != null) {
92	98	continuation.onSuccess(result);
93		} else
94		TokenSpace.dispatch(TokenSpace
95		.detailsOf((SubsampleDTO) result));
96		// History
97		// .newItem(TokenSpace
98		// .detailsOf((SubsampleDTO) result));
	99	} else {
	100	if (History.getToken().equals(
	101	TokenSpace.detailsOf((SubsampleDTO) result))) {
	102	TokenSpace.dispatch(TokenSpace
	103	.detailsOf((SubsampleDTO) result));
	104	} else {
	105	History.newItem(TokenSpace
	106	.detailsOf((SubsampleDTO) result));
	107	}
	108	}
	109
99	110	}
100	111
…	…
114	125	DOM.setInnerText(sampleHeader, "Subsample " + s.getName());
115	126	sampleId = s.getSample().getId();
	127	this.getWidget(7).setVisible(false);
	128	}
	129	protected void onDeleteCompletion(final Object result) {
	130	History.newItem(TokenSpace.detailsOf((sampleObj)));
116	131	}
117	132	};
…	…
122	137	final OnEnterPanel.ObjectEditor oep = new OnEnterPanel.ObjectEditor(
123	138	p_subsample);
	139	hp = new HorizontalPanel();
	140	hp.setWidth("100%");
124	141	ft = new FlexTable();
	142	ft.setWidth("95%");
125	143	Label details_label = new Label("Attributes");
126	144	details_label.addStyleName("bold");
…	…
135	153	HasHorizontalAlignment.ALIGN_RIGHT,
136	154	HasVerticalAlignment.ALIGN_MIDDLE);
137		~~ft.setWidth("40%");~~
138	155	ft.getFlexCellFormatter().setHeight(0, 0, "35px");
139	156	ft.getFlexCellFormatter().setWidth(0, 1, "100px");
…	…
142	159	HasVerticalAlignment.ALIGN_MIDDLE);
143	160	ft.getRowFormatter().setStyleName(0, "mpdb-dataTableLightBlue");
144
145		add(ft);
	161	hp.add(ft);
	162	add(hp);
146	163	}
147	164
…	…
193	210	subsampleId = id;
194	211	p_subsample.load();
	212	images = new ImageListViewer(subsampleId, false);
	213	hp.add(images);
195	214	showChemicalAnalysis();
196	215	return this;
…	…
215	234	MpDb.subsample_svc.details(s != null && !s.mIsNew() ? s
216	235	.getId() : subsampleId, this);
	236
217	237	} else {
218	238	onFailure(new LoginRequiredException());

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/ProjectListEx.java

r361	r450
27	27	public ProjectListEx() {
28	28	super(new ArrayList<Column>(Arrays.asList(columns)));
	29	}
	30
	31	public ProjectListEx(final String noResultsMessage) {
	32	super(new ArrayList<Column>(Arrays.asList(columns)), noResultsMessage);
29	33	}
30	34

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/SampleListEx.java

r417	r450
7	7
8	8	import com.google.gwt.user.client.rpc.AsyncCallback;
	9	import com.google.gwt.user.client.ui.Image;
9	10
10	11	import edu.rpi.metpetdb.client.locale.LocaleEntity;
…	…
92	93	},
93	94	new Column(enttxt.Sample_rockType(), SampleProperty.rockType),
94		new Column(enttxt.Sample_publicData(), SampleProperty.publicData),
	95	new Column(enttxt.Sample_publicData(), SampleProperty.publicData,
	96	true) {
	97	protected Object getWidget(final MObjectDTO data,
	98	final int currentRow) {
	99	if ((Boolean) data.mGet(SampleProperty.publicData)) {
	100	return new Image("images/checkmark.jpg");
	101	}
	102	return new Image("images/xmark.jpg");
	103	}
	104	},
95	105	new Column("Location", SampleProperty.location, true) {
96	106	protected Object getText(final MObjectDTO data,

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/UserProjectsListEx.java

r426	r450
18	18	import com.google.gwt.widgetideas.table.client.FixedWidthFlexTable;
19	19
	20	import edu.rpi.metpetdb.client.locale.LocaleHandler;
20	21	import edu.rpi.metpetdb.client.model.ProjectDTO;
21	22	import edu.rpi.metpetdb.client.paging.PaginationParameters;
…	…
124	125
125	126	private void addProjects() {
126		list = new ProjectListEx() {
	127	list = new ProjectListEx(LocaleHandler.lc_text.noProjectsFound()) {
127	128	public void update(final PaginationParameters p,
128	129	final AsyncCallback<Results<ProjectDTO>> ac) {

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/UserSamplesList.java

r426	r450
148	148
149	149	private void addSamples() {
150		list = new SampleListEx() {
	150	list = new SampleListEx(LocaleHandler.lc_text.noSamplesFound()) {
151	151	public void update(final PaginationParameters p,
152	152	final AsyncCallback<Results<SampleDTO>> ac) {

trunk/mpdb-common/src/edu/rpi/metpetdb/client/locale/LocaleText.java

r441	r450
33	33	String addSampleDescription();
34	34	String publicDataWarning();
	35	String noSamplesFound();
35	36
36	37	/* Subsamples */
…	…
47	48	String addProject();
48	49	String addProjectDescription();
	50	String noProjectsFound();
49	51
50	52	/* Comments */

trunk/mpdb-common/src/edu/rpi/metpetdb/client/locale/LocaleText.properties

r441	r450
36	36	addSampleDescription = Use the form below to enter a sample into MetPetDB.
37	37	publicDataWarning = Public samples cannot be modified. Be sure this what you want.
	38	noSamplesFound = No samples were found.
38	39
39	40	# Subsamples
…	…
50	51	addProject = New Project
51	52	addProjectDescription = Enter the name of your new project below.
	53	noProjectsFound = You are not associated with any projects.
52	54
53	55	# Comments

trunk/mpdb-common/src/edu/rpi/metpetdb/public/style/elements.css

r412	r450
267	267	background-color: #FF3300;
268	268	}
269

Context Navigation

Changeset 450

Legend:

Download in other formats: